https://github.com/osakihsieh/dahaomen into gh-pages

Conflicts:
	index.html
2