battebot fix
Battler added
f
Merge branch 'master' of https://github.com/jonje/BattleBots

Conflicts:
	bin/edu/neumont/lab/battlebot/BattleBot.class
	src/edu/neumont/lab/battlebot/BattleBot.java
th