My commit before Julio's SQL error
Pictures
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/Entities/App.Config
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551.mdf
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551_log.ldf
	Jukebox/Jukebox/Content/Site.css