更に編集
Merge branch 'master' of github.com:310apps/sp-web

Conflicts:
	README.md