add rdio last song
spacing
fix merge conflicts