uhhh not totally sure
Merge branch 'master' of https://github.com/kyledobitz/YouAreAnApartment

Conflicts:
	Unity Project/Assets/Scripts/ScaryObject.cs.meta