make combining unit groups more intuitive
Merge branch 'master' of https://github.com/mattzhao92/Planet-Blitz