cleaned code
merged
merged
merged
Merge branch 'master' of https://github.com/Phil0110/OOT.git

Conflicts:
	OOT/src/imb/SS14/team05/halma/GameController.java