merge bryan, eric and my changes (hud, maps, upgrades)
Merge branch 'master' of github.com:Milez213/CityTrial