main header
Merge branch 'master' of https://github.com/UNCGamerz/GameOne

Conflicts:
	src/main.cpp