Small changes
Merge branch 'master' of github.com:41407/flaming-flying-machine

Conflicts:
	flaming-flying-machine/Library/ScriptAssemblies/Assembly-CSharp.dll
	flaming-flying-machine/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	flaming-flying-machine/Library/assetDatabase3
Rotatorz