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

Conflicts:
	DerivedData/Game/TextIndex/text-index.idx
dasd