Merge branch 'master' of https://github.com/puged/Munch_for_Java

Conflicts:
	src/GameWindow.java
Merge branch 'master' of https://github.com/puged/Munch_for_Java