fixing combat
Merge branch 'master' of https://github.com/nkornek/Spaceship

Conflicts:
	SpaceShip/Assets/Scenes/Main.unity