conflict test nshimizu
Merge branch 'master' of https://github.com/interspace-system/sample into nshimizu_test01

Conflicts:
	README.md
Merge pull request #5 from interspace-system/nshimizu_test01

Nshimizu test01