comitの説明を追加ぁぁぁァァァッ！
Merge branch 'master' of https://github.com/norabal/github_project

Conflicts:
	sample.txt