macで変更
Merge branch 'master' of https://github.com/fuji60/git_test

Conflicts:
	readme.txt