...
Merge branch 'master' of https://github.com/jdhuns2/cs499

Conflicts:
	Assembly-CSharp.pidb
	cs499.userprefs