1.修改伪春菜配置到本地
Merge branch 'gitcafe-pages' of https://gitcafe.com/Dray/Blog-gor into gh-pages

Conflicts:
	2011/01/08/bluehost-xia-zhu-yu-ming-he-fu-jia-yu-mu-lu-lu-jing-de-zi-ding-yi/index.html
	2011/01/08/mantis-han-hua-fang-fa/index.html
	2011/01/08/ubuntu--huan-jing-xia---an-zhuang--java6-sdk/index.html
	2011/01/08/zhong-ji-shellzsh/index.html
	2011/01/10/javascript--jian-cha-zi-fu-chuan-shi-fou-shi-shu-zi-de-ji-zhong-fang-fa/index.html
	2011/01/15/three-rules-programmers/index.html
	2011/01/18/i-do-not-know-that-the-above-gives-strong-feelings-meager-sentence/index.html
	2011/01/18/smarty-escape-braces/index.html
	2011/01/19/80-if-you-can-not-afford-a-house-after-the-boys-80-girls-you-can-marry-40-year-old-man/index.html
	2011/01/20/firefox-zhong-yong-js-ti-jiao-biao-dan/index.html
	2011/01/20/sql-distinct-qu-diao-zhong-fu-de-shu-ju-tong-ji-fang-fa/index.html
	2011/01/21/smarty-e6-a8-a1-e6-9d-bf-e4-b8-ad-e5-ae-9a-e4-b9-89-e5-8f-98-e9-87-8f-e7-9a-84-e6-96-b9-e6-b3-95/index.html
	2011/01/26/foreign-lightweight-open-source-forum-system-introduced-vanilla-forums/index.html
	2011/01/28/2-sync-from-the-twitter-plugin-wordpress/index.html
	2011/01/28/found-2-wordpress-plugin-share-music-related-oh-well/index.html
	2011/01/28/javascript--zhong-de-han-shu-shi-bian-cheng-shi-jian/index.html
	2011/01/28/php-jian-ce-yong-hu-shi-fou-shi-yong-dai-li-shang-wang-de-fang-fa/index.html
	2011/01/28/php-shan-chu-wen-jian-unlink/index.html
	2011/01/28/xml-cdata/index.html
	2011/01/29/ah-taobao-taobao-the-project-ah-the-project/index.html
	2011/01/29/open-realty-3-0/index.html
	2011/02/09/online-software-navigation/index.html
	2011/02/09/password-viewer-to-view-the-machine-saved-passwords/index.html
	2011/02/09/unified-microblogging-connection-sina-tencent-microblogging-connection-watercress-connection-icon-style/index.html
	2011/02/11/litespeed_-baidu-encyclopedia/index.html
	2011/02/12/php-remove-html-tags-javascript-code-blank-characters-etc/index.html
	2011/02/12/php-to-get-a-date-for-the-first-few-weeks-of-the-month/index.html
	2011/02/14/php-directory-listing-all-the-files/index.html
	2011/02/14/shi-jie-shang-zui-shen-qi-de-shu-zi-shi/index.html
	2011/02/15/seven-misconceptions-https/index.html
	2011/02/16/how-to-determine-whether-a-site-is-the-wall/index.html
	2011/02/16/php-smarty-cache-operation/index.html
	2011/02/16/to-achieve-cross-browser-float-center/index.html
	2011/02/17/php-smarty-caching-application-template-engine/index.html
	2011/02/18/a-few-good-free-resources/index.html
	2011/02/18/fund-22-asked-you-know-it/index.html
	2011/02/18/http-functions-php/index.html
	2011/02/18/jquery-live-and-event-delegation/index.html
	2011/02/18/notepad-to-remove-the-code-line-number-of-the-several-methods/index.html
	2011/02/18/php-bmp-format-image-into-jpg-format-program/index.html
	2011/02/18/php-file-download-large-file-support-class-supports-http-over-2g/index.html
	2011/02/21/have-had-to-buy-bread-as-much-as-17-of-the-bread-tax/index.html
	2011/02/23/modify-the-hosts-file-under-ubuntu/index.html
	2011/02/23/ubuntu-using-svn/index.html
	2011/02/24/being-wronged-file_exists/index.html
	2011/02/24/winetricks-wine-on-a-database-and-software-to-install-windows-on-a-small-program/index.html
	2011/02/25/ie-there-stack-overflow-at-line-wrong-solution/index.html
	2011/03/09/tai-shen-qi-le--yuan-lai-url-mao-dian/index.html
	2011/03/12/google-buzz-real-time-synchronization-method-of-twitter/index.html
	2011/03/19/vps-hosting-to-do-with-just-bought-a-mirror/index.html
	2011/03/19/vps-travel-with-unixbench-test-results/index.html
	2011/03/20/modify-the-ssh-password/index.html
	2011/03/24/modify-the-ssh-login-message/index.html
	2011/03/24/xmarks-browser-favorites-sync-tools-support-ie9-chrome-firefox-iesafari/index.html
	2011/04/02/interpretation-of-god-i-think-thats-very-good/index.html
	2011/04/14/mysql-database-into-memcached-support-nosql/index.html
	2011/04/14/search-engine-configuration-optimization-notes-the-bosss-lecture/index.html
	2011/04/14/separation-of-mind-to-read-and-write-mysql/index.html
	2011/04/15/original-mysql_insert_id-is-not-safe-ah-do-not-know-any-other-ways-to-get-into-the-self-by-id/index.html
	2011/04/18/directory_separator-and-path_separator-constant-constant/index.html
	2011/04/23/to-laugh-at-the-worlds-historians-distorted-the-history-of-china-the-chinese-yuan-and-qing-ever/index.html
	2011/04/25/bug-ie6-the-div-a-height-of/index.html
	2011/04/26/proxy-switchy-can-open-the-https-not-open-http-solution/index.html
	2011/04/27/shared-google-reader-content-to-twitter-facebook/index.html
	2011/04/27/synchronized-to-the-official-facebook-twitter-services-httpapps-facebook-comtwitter/index.html
	2011/04/28/php-log-system-plog/index.html
	2011/04/28/recommended-a-public-comment-system-disqus/index.html
	2011/04/30/archlinux-some-of-the-information/index.html
	2011/05/04/my-home-network-and-the-connectivity-of-several-servers/index.html
	2011/05/04/remove-the-extra-css-style-page/index.html
	2011/05/12/webqq-js-code-in-the-adaptive-width/index.html
	2011/05/14/transfer-files-through-ssh/index.html
	2011/05/17/automatically-generated-navigation-menu-using-jquery/index.html
	2011/05/20/solve-sysfader-iexplore-exe-application-error/index.html
	2011/09/23/delete-ubuntu-desktop/index.html
	2011/09/23/ubuntu-11-10-beta-2-oneiric-ocelot-fa-bu-liao/index.html
	2011/09/25/ubuntu-shang-an-zhuang-lamp-fu-wu-qi/index.html
	2011/12/06/xiu-gai-vs2010-mo-ren-liu-lan-qi/index.html
	2011/12/26/under-windows-nodejs/index.html
	2012/02/06/hello-octopress/index.html
	2012/02/17/upload-folders/index.html
	2012/02/29/insert-ruby-on-rails-in-ubuntu-11-dot-10/index.html
	2012/06/16/google-chrome-as-system-default-browse/index.html
	2013/03/19/30-year-old/index.html
	2013/04/15/gedit-plugin/index.html
	2013/04/15/ubuntu-grub-boot-windows7-error/index.html
	2013/04/15/ubuntu-ruby/index.html
	2013/04/15/ubuntu-sources-list/index.html
	2013/04/15/ubuntu-sources-update-error/index.html
	2013/04/16/sublime-text2-config/index.html
	2013/06/13/vps-dropbox/index.html
	2013/06/16/nginx-ssl/index.html
	2013/06/16/ubuntu-nginx-php-shell/index.html
	2013/06/16/uwsginginx-run-flask-twip/index.html
	2013/06/24/pi-webcam/index.html
	2013/08/22/ubuntu-ssh-proxy/index.html
	2013/08/29/xampp-redis-mongodb-mariadb/index.html
	2013/11/30/ubuntu-golang/index.html
	2013/12/27/open-your-eyes/index.html
	2014/03/06/oschina_tweet/index.html
	2014/04/11/php-soap-and-net-soap/index.html
	2014/04/11/pushbullet-api/index.html
	2014/05/15/centos-commands/index.html
	2014/05/15/ubuntu-bash-completion/index.html
	2014/06/02/shadowsocks/index.html
	2014/07/28/twister/index.html
	about/index.html
	archive/index.html
	categories/index.html
	index.html
	pages/index.html
	rss.xml
	shjs/index.html
	tags/index.html
1.更新 gor
1.整理代码