commit from 1
Merge branch 'master' of github.com:inabe49/git-test

Conflicts:
	README.md