GameMaster, constants, and main final clean up
Merge branch 'master' of github.com:mrplants/RoboDog

Conflicts:
	GameMaster.cpp
	main