たかなしcommit2
Merge branch 'master' of github.com:Takanashi1443/Tutorial

Conflicts:
	sample.txt