ok
mm
a
for production
ee
a
Merge branch 'dev' of github.com:likesea/blog

Conflicts:
	.app.js.swp
	access.log
	models/comment.js~
	models/post.js~
	models/user.js~
	views/header.ejs~