Fixed some stuff.
Merge branch 'master' of github.com:Oscillation/Combat-Net