1kara
Merge branch 'master' of github.com:Taiki0721/test_repos

Conflicts:
	sample.txt