Spaceship now collides with aliens (stops)
Merge remote-tracking branch 'origin/master'