Auto Run
Merge remote-tracking branch 'origin/master'

Conflicts:
	RobotSpaceMiner/Assets/Scenes/MainLevel.unity
	RobotSpaceMiner/RobotSpaceMiner-csharp.sln
	RobotSpaceMiner/RobotSpaceMiner.sln
forced commit