hayday
Merge branch 'gh-pages' of github.com:soramugi/soramugi.net into gh-pages

Conflicts:
	_config.yml