Changes, and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	java/GameMaster.java