Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages' into test
indexのリンクがまちがっていたので修正
Merge branch 'test'

Conflicts:
	index.html
Merge branch 'master' of github.com:tyrellsys/group3

Conflicts:
	index.html