Encampment soldiers now break out of encampment state in case of battle
Merge branch 'master' of github.com:ryancheu/Battle2013Team0
Merge branch 'master' of github.com:ryancheu/Battle2013Team0
Fixing encampment goto break logic