merged branches, and fixed some inconsistencies
forgot main.cpp
Merge branch 'testMe' of ssh://github.com/utzms/StarcraftProjectAdvpt into testMe