committing my changes to merge with daryls
Merge branch 'master' of https://github.com/juliogarcia93/Jukebox

Conflicts:
	Jukebox/DataAccessLayer/Business Logic/SongManager.cs
	Jukebox/Jukebox.v11.suo
Merge branch 'master' of https://github.com/juliogarcia93/Jukebox
Merge branch 'master' of https://github.com/juliogarcia93/Jukebox

Conflicts:
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551.mdf
	Jukebox/Jukebox/App_Data/aspnet-Jukebox-20131008053551_log.ldf
changed some of the naming conventions, does not add user to our database yet, and rooms don't work