Attempting to pull from remote branch
I dont understand offsite shit
I don't get git
Merge branch 'master' of https://github.com/MaFoley/CBHProject

Conflicts:
	CompileLoad
	CreateColor
	CreateCounty
	CreateState
	CreateVMake
	CreateVType
	State.cpp
	State.h
	StateTest.cpp
	a.out
	cbhproj