修正
マージするの？
no message
Revert "no message"

This reverts commit cda7cfc8a555f0ddfad196d21495f912ad7e987f.
no message
Merge branch 'master' into test2

Conflicts:
	index.html
no message
Merge branch 'test2'