protectEncampments type
the actual file
conflict resolve
Merge branch 'master' of github.com:ryancheu/Battle2013Team0