同盟战
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup.txt
	src/main/java/robot/tnk47/Tnk47Robot.java