Stay in formation when entering combat
Merge branch 'master' of github.com:ryancheu/Battle2013Team0
Merge branch 'master' of github.com:ryancheu/Battle2013Team0

Conflicts:
	MineTurtle/Robots/Types/SoldierArmyType.java