Aliens block moving okay.
Merge remote-tracking branch 'origin/master'

Conflicts:
	space_invaders/js/space.coffee
Presentation 2 created.