update merge
Merge branch 'master' of https://github.com/chuo-u-openproject2013/WearableWeb

Conflicts:
	README.md