git使い方.txtをこうしんしました
Merge branch 'master' of https://github.com/itsuki5k/bassball-ban

Conflicts:
	git使い方.txt