Merge
Merge branch 'master' of https://github.com/mibewh/seniorProject.git

Conflicts:
	Senior Project/src/wzh/game/input/Menu.java