Merge branch 'master' of https://github.com/oshiho3/sample_app

Conflicts:
	README.md
Merge branch 'master' of https://github.com/oshiho3/sample_app