no message
Merge branch 'master' of https://github.com/kazunorisasaki/sample

Conflicts:
	abc.txt