branching for gabe
Marsh
Stuffs
Merge branch 'gabesBranch'

Conflicts:
	Marsh/Debug/Marsh.exe
	Marsh/Debug/Marsh.ilk
	Marsh/Debug/Marsh.pdb
	Marsh/Marsh.ncb
	Marsh/Marsh.sln
	Marsh/Marsh.suo
	Marsh/Marsh/Debug/BuildLog.htm
	Marsh/Marsh/Debug/World.obj
	Marsh/Marsh/Debug/main.obj
	Marsh/Marsh/Debug/mt.dep
	Marsh/Marsh/Debug/vc90.idb
	Marsh/Marsh/Debug/vc90.pdb
	Marsh/Marsh/Marsh.vcproj
	Marsh/Marsh/main.cpp
Merge branch 'sturg'
fixing what i broke... almost done
Update Marsh.vcproj
Update Marsh.vcproj