GE
Merge branch 'master' of https://github.com/Jhoogland/Pacman

Conflicts:
	build/classes/Game$Panel.class
	nbproject/private/private.xml
	src/Game.java
	src/Pacman.java
Simple game engine