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

Conflicts:
	Assembly-CSharp.pidb
	Assets/James'Workspace.unity
	cs499-csharp.sln
	cs499.sln
	cs499.userprefs