testfire
Merge branch 'shoot' of github.com:sbaechler/space-invaders into shoot

Conflicts:
	app/scripts/models.js
alien without control