1
Merge branch 'master' of https://github.com/wen-/myblog

Conflicts:
	views/say.jade