Temporary, still not completed
Merge branch 'master' of https://github.com/samsath/G64SWE_SpaceTrade

Conflicts:
	Working buy and sell interface/SpaceGame/SpaceGame/SpaceGame/GameScreens/AdminScreen.cs
	Working buy and sell interface/SpaceGame/SpaceGame/SpaceGame/GameScreens/BuyScreen.cs
	Working buy and sell interface/SpaceGame/SpaceGame/SpaceGame/GameScreens/SaveHistoryScreen.cs