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

Conflicts:
	Assembly-CSharp.pidb
	cs499-csharp.sln
	cs499.sln
	cs499.userprefs
This seems to work