tes
Merge branch 'リリース後'

Conflicts:

battle-counter_v1.1.xcworkspace/xcuserdata/ten.xcuserdatad/UserInterface
State.xcuserstate
	battle-counter_v1.1/.DS_Store