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

Conflicts:
	app/scripts/models.js
alien without control
Schuss verbessert
Merge branch 'shoot'

Conflicts:
	app/scripts/main.js
	app/scripts/models.js
test not working
Merge branch 'master' into shoot
add test
Game Over Schrift erscheint
test funkionieren nicht
Merge branch 'master' into shoot

Conflicts:
	app/scripts/main.js
	app/scripts/models.js
	test/spec/test.js
tests passing
Merge branch 'shoot'
remove log statement