commit & push test.
Merge branch 'master' of https://github.com/nob/mimamori

Conflicts:
	mimamori_html/index.html