we now build soldiers if waiting on encampments
Merge branch 'master' of https://github.com/ryancheu/Battle2013Team0