Here

Some new stuff
Merge branch 'master' of https://github.com/Shtevay/JavaJesus

Conflicts:
	src/ca/javajesus/game/Game.java