Merge branch 'master' of https://github.com/eduardtm/SpaceInvaders

Conflicts:
	SpaceInvaders.js