update
update
Merge branch 'master' of https://github.com/jackywjj/flask-blog

Conflicts:
	flaskblog/app/templates/_page_top.html