messed with lots of fear stuff; duplicated a scene
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity Project/Assets/Editor/Image
Effects/AntialiasingAsPostEffectEditor.js.meta
	Unity Project/Assets/Scripts/DisplayTotalFear.cs.meta
	Unity Project/Assets/Scripts/FearEffectChoice.cs.meta
all gonna die
Merge branch 'master' of https://github.com/kyledobitz/YouAreAnApartment