COmmittting my shit again
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/Entities/Music1.Designer.cs
	Jukebox/Jukebox.v11.suo
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551.mdf
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551_log.ldf
Committing my work.  Got the upload to work again as well as displaying the name of the song and artist on the music player at the bottom of the profile page.