Had to commit to sync
Merge branch 'master' of https://github.com/devildothack/SEFinalProject

Conflicts:
	build/classes/finalproject/FinalProject.class