lap checking
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade

Conflicts:
	SpaceGame/SpaceGame/SpaceGame/SpaceGame.csproj
	SpaceGame/Test/SpaceShipTest.cs
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade