Fear Meter, a bunch of nonsense
Merge branch 'master' of https://github.com/kyledobitz/YouAreAnApartment

Conflicts:
	Unity Project/Library/ScriptMapper
	Unity Project/Library/assetDatabase3
	Unity Project/Library/guidmapper
	Unity Project/Library/shadercompiler-1.log