Shooting stuff, more gitignore
Merge branch 'master' of github.com:41407/flaming-flying-machine

Conflicts:
	flaming-flying-machine/Library/AssetServerCacheV3
	flaming-flying-machine/Library/ScriptAssemblies/Assembly-CSharp.dll
	flaming-flying-machine/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	flaming-flying-machine/Library/assetDatabase3
	flaming-flying-machine/Library/guidmapper
	flaming-flying-machine/Library/metadata/19/1980647551f2146f583c4f307c1d4f8a
	flaming-flying-machine/Library/metadata/21/2150c35b66f2744c0a4f9924d5b96187
	flaming-flying-machine/Library/metadata/37/374f6dda4a597d54395c9c9b308b7605
	flaming-flying-machine/Library/metadata/54/54988a39c03b76f499aca415613e363f
	flaming-flying-machine/Library/metadata/93/930f22b5c08ecbc44933ccdb08e0dfea
	flaming-flying-machine/Library/metadata/b2/b2889198665cc4b99b124fc2c6daa3f7
	flaming-flying-machine/Library/metadata/ee/eeacf895d83ce134f8af50348f687c2a
	flaming-flying-machine/Temp/__EditModeScene