add local development branch
添加关于我页面
Merge branch 'development'

Conflicts:
	models/index.js
change .gitignore for production
添加博文内容页面
Merge branch 'development'