O Samba, a Bossa e as Novas