Merge branch 'master' of
https://github.com/Coled123456789/PacManGridWorld.git

Conflicts:
	PacMan/src/pmgw/GameManager.java