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

Conflicts:
	public/atom.xml
	public/blog/2011/06/15/first-blog/index.html
	public/blog/2011/06/16/rails3.1/index.html
	public/blog/2011/06/16/ubuntu1104-install/index.html
	public/blog/2011/06/17/rubygems-cache/index.html
	public/blog/2011/06/18/two-good-presents/index.html
	public/blog/2011/06/20/my-developing-environment/index.html
	public/blog/2011/06/20/trouble-of-mayun/index.html
	public/blog/2011/06/21/inside-rails-and-merb/index.html
	public/blog/2011/06/24/notes-of-r4r/index.html
	public/blog/2011/06/24/the-end-of-term2/index.html
	public/blog/2011/06/25/notes-of-ihower-rails/index.html
	public/blog/2011/06/28/display-git-branch-in-shell/index.html
	public/blog/2011/07/07/new-service-offered-by-heroku-nodejs/index.html
	public/blog/2011/07/30/review-of-biograph-for-wjl/index.html
	public/blog/2011/08/29/sass/index.html
	public/blog/2011/09/07/read-market/index.html
	public/blog/2011/09/08/superinterior/index.html
	public/blog/2011/09/15/waikanban-diandi/index.html
	public/blog/2011/10/27/lunyu-notes/index.html
	public/blog/2011/12/02/italian-holiday/index.html
	public/blog/2012/01/04/gaohua-lecture-notes/index.html
	public/blog/2012/01/20/X441-notes/index.html
	public/blog/2012/01/29/chuang-xin-shi-shi-yao/index.html
	public/blog/2012/01/29/yang-san-jiao-dao-di-zhi-shi-yao/index.html
	public/blog/2012/02/17/my-way-to-choose-a-home-router/index.html
	public/blog/2012/02/20/the-way-to-link-to-iptv-in-shanghai-through-vlan/index.html
	public/blog/2012/02/29/geminniandai/index.html
	public/blog/2012/03/01/svnlook/index.html
	public/blog/2012/03/05/fldk/index.html
	public/blog/2012/03/05/ukgov-notes/index.html
	public/blog/2012/03/13/jiejifenchen/index.html
	public/blog/2012/03/20/no-sql-databases-notes/index.html
	public/blog/2012/03/21/braces-and-do-end/index.html
	public/blog/2012/03/26/book-for-a-pmp/index.html
	public/blog/2012/03/27/the-difference-between-mapreduce-and-hadoop/index.html
	public/blog/2012/03/29/learning-mongodb-1/index.html
	public/blog/2012/03/30/learning-mongodb-2/index.html
	public/blog/2012/04/01/journey-plan-to-hangzhou/index.html
	public/blog/2012/04/02/all-aoubt-dba-notes/index.html
	public/blog/2012/04/08/about-salesforce/index.html
	public/blog/2012/04/08/what-is-numa-and-the-effect-of-it/index.html
	public/blog/2012/04/12/knowing-what-not-to-test-is-the-harder-part/index.html
	public/blog/2012/04/15/lessons-from-a-training-on-pm/index.html
	public/blog/2012/04/17/deployment-and-administration-for-mongod/index.html
	public/blog/2012/04/17/gimli-and-markdown-2-pdf/index.html
	public/blog/2012/04/19/heredocs/index.html
	public/blog/2012/04/19/some-useful-link/index.html
	public/blog/2012/04/19/taps-a-simple-app-to-transfer-data/index.html
	public/blog/2012/04/23/arp-binding/index.html
	public/blog/2012/04/24/the-rails-view/index.html
	public/blog/2012/04/25/zaguosen2012/index.html
	public/blog/2012/04/26/finance-notes/index.html
	public/blog/2012/05/10/oracle-partition-split-issues/index.html
	public/blog/2012/05/22/where-to-use-nodejs/index.html
	public/blog/2012/05/24/ruankao/index.html
	public/blog/2012/05/27/take-the-exam/index.html
	public/blog/2012/05/28/websocket/index.html
	public/blog/2012/05/29/inside-github/index.html
	public/blog/2012/05/30/vi-for-aptana/index.html
	public/blog/2012/05/30/yigediaosidenixi/index.html
	public/blog/2012/06/01/note-on-coffeescript/index.html
	public/blog/2012/06/04/nodejs/index.html
	public/blog/2012/06/05/replace-log-files-with-streams/index.html
	public/blog/2012/06/06/sam-stephensons-better-js-with-coffeescript/index.html
	public/blog/2012/06/13/yueyin-foxmail-cracker/index.html
	public/blog/2012/06/23/javascript-the-good-parts/index.html
	public/blog/2012/06/26/hubot-and-socket-dot-io/index.html
	public/blog/2012/06/26/programming-language-performance/index.html
	public/blog/2012/06/27/git-init/index.html
	public/blog/2012/06/29/ssh-key/index.html
	public/blog/2012/07/02/shu-xue-zhi-mei/index.html
	public/blog/2012/07/11/the-hardware-architecture-of-37-signals/index.html
	public/blog/2012/07/11/user-stories-applied-for-agile-software-development/index.html
	public/blog/2012/07/13/levels/index.html
	public/blog/2012/07/21/herokus-buildpacks-and-redeploy-for-jekyll-and-octopress/index.html
	public/blog/2012/07/31/mange-it-your-guide-to-progmatic-project-management/index.html
	public/blog/2012/08/03/ship-it/index.html
	public/blog/archives/index.html
	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/page/2/index.html
	public/blog/page/3/index.html
	public/blog/page/4/index.html
	public/blog/page/5/index.html
	public/blog/page/6/index.html
	public/blog/page/7/index.html
	public/blog/page/8/index.html
	public/index.html
	public/sitemap.xml
	public/stylesheets/screen.css
delete public