hello martijn
Merge branch 'master' of https://github.com/martijnwetering/Pacman

Conflicts:
	src/game/PacmanApplication.java