eh
:Merge branch 'master' of https://github.com/craleigh318/SJSU-CS160-LeagueOfOrdinaryGentlemen

Conflicts:
	LoOG Music Database/build/web/WEB-INF/classes/library_handling/simpleActions.class