Got upload working and changed create so it has a room. Made Addsongtoroom function
Working on add songs in room
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/DataAccessLayer/Business Logic/SongManager.cs
	Jukebox/DataAccessLayer/Repositories/SongRepository.cs
	Jukebox/Entities/Music.edmx.sql
	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
	Jukebox/Jukebox/Controllers/PlaylistController.cs
	Jukebox/Jukebox/Views/Room/Create.cshtml
	Jukebox/Jukebox/Views/Shared/_Layout.cshtml
Adding minor updates
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/DataAccessLayer/Business Logic/SongManager.cs
	Jukebox/DataAccessLayer/Conversions/ModelConversions.cs
	Jukebox/DataAccessLayer/Models/AccountModel.cs
	Jukebox/DataAccessLayer/Models/RoomModel.cs
	Jukebox/DataAccessLayer/Repositories/SongRepository.cs
	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
	Jukebox/Jukebox/Controllers/MusicController.cs
	Jukebox/Jukebox/Controllers/PlaylistController.cs
	Jukebox/Jukebox/Controllers/RoomController.cs
	Jukebox/Jukebox/Jukebox.csproj
	Jukebox/Jukebox/Views/Room/Create.cshtml
	Jukebox/Jukebox/Views/Shared/_Layout.cshtml
	Jukebox/Jukebox/bin/taglib-sharp.dll
Merge branch 'master' of github.com:juliogarcia93/Jukebox
Working on likes
Working on like button
Merge branch 'master' of github.com:juliogarcia93/Jukebox

Conflicts:
	Jukebox/DataAccessLayer/Models/SongList.cs
	Jukebox/Entities/Music.edmx.sql
	Jukebox/Entities/Music1.Designer.cs
	Jukebox/Jukebox.v11.suo
	Jukebox/Jukebox/bin/taglib-sharp.dll
Added Like to songs