local_mod_11:30
Merge remote-tracking branch 'origin/master'
conflict_11:33
Merge branch 'master' of https://github.com/dai-sato/Test.git

Conflicts:
	README.md