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
fix tests
add shield damage, tests
dist update
Game Over Schrift erscheint
aliens can destroy shields
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
conflict solved..
abbruch von aliens2