つじみつこーへんから発表からけす
もう稲田堤いややわ@plum
Merge remote-tracking branch 'origin/gh-pages-3T' into gh-pages

Conflicts:
	index.html
Merge remote-tracking branch 'origin/gh-pages' into gh-pages