space taxi updates
Merge branch 'master' of https://github.com/javageek68/mikulus

Conflicts:
	SpaceTaxi/SpaceTaxi-csharp.sln
	SpaceTaxi/SpaceTaxi.sln
	SpaceTaxi/SpaceTaxi_Data/output_log.txt
tweak cam settings