Collision for bullet/enemy & enemy/magine ship
Merge branch 'master' of https://github.com/micke-b/battlestar-5000

Conflicts:
	BattleStar-5000/MyScene.m
	BattleStar-5000/Ship.m