merged power and smart camp code
Merge branch 'master' of
https://github.com/TeamYOLO/TeamYoloBattlecode.git

Conflicts:
	teams/team235/Soldier.java