Commit to merge changes.
Merge branch 'master' of https://github.com/gncstudios/IMP

Conflicts:
	DatabaseProgram/DatabaseProgram/SongLibrary.mdf
	DatabaseProgram/DatabaseProgram/SongLibrary_log.ldf