はじめてのコミット
Merge branch 'master' of https://github.com/toriumi0118/git_tutorial

Conflicts:
	sample.txt