fixed small stuff
asdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	PacMan/bin/pmgw/GameWorld.class
	PacMan/src/pmgw/GameWorld.java