removed bugs from Unit.h; added minerals and vespene to combat.txt
Merge branch 'master' of ssh://github.com/jo5ch/sc2_simulation