old
Merge branch 'master' of github.com:swachian/new-octopress

Conflicts:
	public/blog/categories/git/atom.xml
	public/blog/categories/git/index.html
	public/blog/categories/heroku/atom.xml
	public/blog/categories/heroku/index.html
	public/blog/categories/linux/atom.xml
	public/blog/categories/linux/index.html
	public/blog/categories/nodejs/atom.xml
	public/blog/categories/nodejs/index.html
	public/blog/categories/nosql数据库/atom.xml
	public/blog/categories/nosql数据库/index.html
	public/blog/categories/rails/atom.xml
	public/blog/categories/rails/index.html
	public/blog/categories/ruby/atom.xml
	public/blog/categories/ruby/index.html
	public/blog/categories/sass/atom.xml
	public/blog/categories/sass/index.html
	public/blog/categories/script/atom.xml
	public/blog/categories/script/index.html
	public/blog/categories/svn/atom.xml
	public/blog/categories/svn/index.html
	public/blog/categories/云计算/atom.xml
	public/blog/categories/云计算/index.html
	public/blog/categories/外刊/atom.xml
	public/blog/categories/外刊/index.html
	public/blog/categories/安装/atom.xml
	public/blog/categories/安装/index.html
	public/blog/categories/技术/atom.xml
	public/blog/categories/技术/index.html
	public/blog/categories/旅游/atom.xml
	public/blog/categories/旅游/index.html
	public/blog/categories/时评/atom.xml
	public/blog/categories/时评/index.html
	public/blog/categories/期刊/atom.xml
	public/blog/categories/期刊/index.html
	public/blog/categories/测试/atom.xml
	public/blog/categories/测试/index.html
	public/blog/categories/生活/atom.xml
	public/blog/categories/生活/index.html
	public/blog/categories/神器/atom.xml
	public/blog/categories/神器/index.html
	public/blog/categories/笔记/atom.xml
	public/blog/categories/笔记/index.html
	public/blog/categories/网络编程/atom.xml
	public/blog/categories/网络编程/index.html
	public/blog/categories/读书笔记/atom.xml
	public/blog/categories/读书笔记/index.html
	public/blog/categories/车牌/atom.xml
	public/blog/categories/车牌/index.html
	public/blog/categories/车车/atom.xml
	public/blog/categories/车车/index.html
	public/blog/categories/软考/atom.xml
	public/blog/categories/软考/index.html
	public/blog/categories/项目管理/atom.xml
	public/blog/categories/项目管理/index.html
	public/sitemap.xml
merge