ss
f
Merge remote-tracking branch 'origin/master'

Conflicts:
	PacMan_v6.2/bin/.gitignore
	PacMan_v6.2/bin/hg/EsMain.class
	PacMan_v6.2/bin/hg/EvolveMultiSeed.class
	PacMan_v6.2/bin/hg/ExecuteEvolvedAgent.class
	PacMan_v6.2/bin/pacman/Executor.class
	PacMan_v6.2/bin/pacman/controllers/HumanController.class
	PacMan_v6.2/bin/pacman/controllers/examples/StarterPacMan.class
	PacMan_v6.2/src/pacman/controllers/HumanController.java