Song downloading
Merge branch 'master' of https://github.com/smashingboxes/smashing_jukebox

Conflicts:
	lib/song.rb