no message
Merge branch 'master' of https://github.com/hl85/openq-blog

Conflicts:
	deploy/404.html