josh manela
Merge branch 'master' of https://github.com/ejrinkus/bonzai

Conflicts:
	CompetitorAI/ais/CompetitorAI.jar
	CompetitorAI/auto.replay
	CompetitorAI/bin/CompetitorAI.class
	CompetitorAI/bin/CompetitorWeightComparator.class
	CompetitorAI/bin/DoNothingAI.class
	CompetitorAI/src/CompetitorAI.java