もどした、はず
Merge branch 'gh-pages' of github.com:uecmma/jssem2014 into gh-pages

Conflicts:
	index.html