git being finicky
Merge branch 'master' of https://github.com/doppelgangerx4/chasm

Conflicts:
	Hiking/Unity/Assembly-UnityScript.pidb
	Hiking/Unity/Unity.userprefs