fixing logic throughout for updated squad to include unit types
Merge branch 'master' of https://github.com/kjian279/RISC