Organized functions
Merge branch 'master' of https://github.com/jmbodisch/swampatch

Conflicts:
	Experiments/game2.js