mr. h fix for real this time
Merge branch 'master' of https://github.com/dominikfrick/Gridworld-Capture-the-Flag

Conflicts:
	bin/Player.class