Put the defines back in so game could run at main and put Global.cpp in
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath