Class v6
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade

Conflicts:
	SpaceGame/SpaceGame.sln
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade