添加分支文件
分支提交
change flag to 2
change flag to 3
change flag to 0
change flag to 1
Merge branch 'battle'

Conflicts:
	battle.php