now only scouts use that last bit
Merge branch 'master' of https://github.com/ryancheu/Battle2013Team0