solve conflict
Merge branch 'master' of github.com:ljshou/my_blog

Conflicts:
	.gitignore
	db.json
	public/2014/10/30/STL源码分析-list的sort函数/index.html
	public/archives/2014/10/index.html
	public/archives/2014/index.html
	public/archives/index.html
	public/atom.xml
	public/categories/Linux/index.html
	public/categories/STL源码分析/index.html
	public/categories/hexo/index.html
	public/categories/index.html
	public/categories/工作/index.html
	public/index.html
	public/sitemap.xml
	public/tags/IT-工作/index.html
	public/tags/STL/index.html
	public/tags/Shell/index.html
	public/tags/hexo/index.html
	public/tags/index.html