Set up collision box loader
Merge branch 'master' of https://github.com/tchorown/ACM_Lafayette_Game

Conflicts:
	ACM Game Unity/ACM Game Unity-csharp.sln
	ACM Game Unity/ACM Game Unity.sln
	ACM Game Unity/ACM Game Unity.userprefs
	ACM Game Unity/Assembly-UnityScript-vs.unityproj
	ACM Game Unity/Assembly-UnityScript.unityproj
	ACM Game Unity/Assets/testScene.unity
Added/fixed collision file loading
Merge branch 'master' of https://github.com/tchorown/ACM_Lafayette_Game

Conflicts:
	ACM Game Unity/ACM Game Unity-csharp.sln
	ACM Game Unity/ACM Game Unity.sln
	ACM Game Unity/ACM Game Unity.userprefs
	ACM Game Unity/Assembly-UnityScript-vs.unityproj
	ACM Game Unity/Assembly-UnityScript.unityproj
	ACM Game Unity/Assets/testScene.unity