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

Conflicts:
	.gitignore