Committing my shit to the masterz
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/Entities/Music.edmx
	Jukebox/Entities/Music.edmx.diagram
	Jukebox/Entities/Music.edmx.sql
	Jukebox/Entities/Room.cs
	Jukebox/Jukebox.v11.suo
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551.mdf
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551_log.ldf
	Jukebox/Jukebox/Content/Site.css
	Jukebox/Jukebox/Jukebox.csproj
	Jukebox/Jukebox/Views/Account/Profile.cshtml
	Jukebox/Jukebox/Views/Playlist/Create.cshtml
	Jukebox/Jukebox/Views/Shared/_Layout.cshtml
	Jukebox/Jukebox/Views/Shared/_MusicPlayerPartial.cshtml
	Jukebox/Jukebox/bin/taglib-sharp.dll