kjg
Merge branch 'master' of https://github.com/abranch6/AI-battle.git

Conflicts:
	AI-battle-project/src/Field.java