add enemy
Merge branch 'master' of https://github.com/micke-b/battlestar-5000

Conflicts:
	BattleStar-5000.xcodeproj/project.pbxproj