とりあえずcommit
Merge branch 'master' of github.com:es335ab/pathcon

Conflicts:
	index.html
テキストちょっと修正
Merge branch 'master' of github.com:es335ab/pathcon