Merge branch 'master' of https://github.com/TrofSivart/StarshipGame

Conflicts:
	Assets/Scenes/Sprites.unity