battle new created
migrationファイルを整理
Merge branch 'master' of github.com:slic/gtmd

Conflicts:
	app/views/my/battles/new.html.erb