added colission detection.
Merge branch 'master' of https://github.com/retro/regexwars

* 'master' of https://github.com/retro/regexwars:
  Stuff again

Conflicts:
	controls/stage/stage.js