added enemy attraction/repulsion controls
Merge branch 'master' of https://github.com/amurat/ggj2014

Conflicts:
	src/game.js
broke out numEnemiesPerGroup into numEnemies1 and numEnemies2
Merge branch 'master' of https://github.com/amurat/ggj2014