oishi
Merge branch 'master' of github.com:tsukasaoishi/git_lesson

Conflicts:
	sample.txt