asid`
Merge branch 'master' of github.com:baham/baham.github.com

Conflicts:
	01_01_776.html
	01_03_782.html
	01_10_cong-wordpresszhuan-yi-dao-octopress.html
	01_10_githubbang-ding-yu-ming.html
	01_10_ma-nong-di-san-qi-tu-ling-she-qu-chu-pin.html
	01_10_ni-bu-de-bu-zhi-dao-de-octopressde-you-dian.html
	01_10_octopressbo-ke-chang-yong-zi-yuan-hui-zong-bao-gua-cha-jian-,-zhu-ti-,-wen-dang-deng.html
	01_10_octopressru-he-zuo-seoyou-hua.html
	01_10_wei-ruan-illumiroomyan-shi-shi-pin-,liang-xian-kai-yuan-you-xi-tuxracer.html
	01_10_wei-shi-yao-mei-de-da-fen-zi-jie-gou-yi-fang-xiang-jie-gou-wei-zhu.html
	01_10_ying-xiang-mei-bian-zhi-zuo-yong-de-yin-su.html
	01_10_you-ji-xian-wei-mei-yan-zu-fen.html
	01_10_yuan-su-de-chi-zi-lei-xing-yu-xing-cheng-kuang-wu-de-te-dian.html
	01_11_octopress-robots-dot-txtxie-fa.html
	01_12_octopressru-he-an-zhuang-cha-jian.html
	01_12_octopressxiang-guan-wen-zhang-cha-jian.html
	01_12_wo-jin-nian-nong-li-nian-de-jian-zhi-gong-zuo-jie-shu-liao.html
	01_15_shi-yong-fedupcong-fedora-17geng-xin-dao-fedora-18.html
	01_15_zhun-bei-hao-sheng-ji-liao-ma-?shi-yong-preupgradesheng-ji-fedora-18.html
	01_16_octopressshi-yong-disqusliu-yan-xi-tong.html
	01_26_i-got-a-cold-these-days.html
	01_30_hen-jiu-mei-you-geng-xin-bo-ke-de-yuan-yin.html
	01_30_opensuseshi-yong-tumbleweedyuan-,shi-xian-gun-dong-geng-xin.html
	02_01_binix-1-dot-1-shi-chu.html
	02_23_what-will-happen-tomorrow.html
	03_04_xin-nian-ji-yu.html
	03_10_10-43-12.html
	03_10_11-10-26.html
	03_10_octopress-easypost-tool.html
	03_12_blender-wiki-pdfwen-dang-fen-xiang.html
	03_12_ma-nong-di-si-qi-,tu-ling-she-qu-chu-pin.html
	03_12_ubuntuzhong-an-zhuang-pei-zhi-octopresspeng-dao-de-wen-ti.html
	03_13_bodhi-linux-enlightment-huan-jing-shi-yong.html
	03_13_opensusezhong-de-virtualboxpei-zhi.html
	03_20_use-linuxmint16.html
	03_20_wo-wei-shi-yao-yong-linux.html
	03_22_zhao-ben-shan-xiao-pin-<<xin-bing->>-yu-wang-yang-ming-chuan-si-lu-zhong-de-si-sheng-zhi-dao.html
	03_30_ituring-new-version.html
	04_03_torzhen-de-ni-ming-he-an-quan-ma-?.html
	04_11_blendertai-wan-da-shen-[nil]artspacemediashi-pin-jiao-cheng.html
	04_12_zhe-xie-nian-pei-ban-wo-de-mei-ju.html
	04_17_shi-yong-chromiumos.html
	04_20_21-29-52.html
	04_21_18-00-28.html
	04_21_18-44-52.html
	04_21_go-to-shenzhen.html
	04_24_shenzhen.html
	04_24_use-english-to-write-articles.html
	04_25_you-shi-hen-jiu-mei-you-geng-xin-bo-ke.html
	04_26_exchange-dream-by-jiaqian.html
	04_26_internship-in-pingdingshan.html
	04_27_3-hours-in-zhengzhou.html
	04_28_ruby-multi-line.html
	04_28_the-ruby-community.html
	04_29_octopress-seo.html
	05_01_21-24-octopress-orinal-link-bug-fix.html
	05_01_shi-yong-blenderzuo-3dda-yin.html
	05_02_church-meeting-in-worker-s-day.html
	05_05_chakra-linuxan-zhuang-shi-yong.html
	05_05_the-great-hypnotist.html
	05_06_ruby-multidimensional-arrays.html
	05_06_what-an-amazing-software.html
	05_06_zuo-tian-cai-fa-xian-wo-de-zhan-dian-bei-bai-du-hen-hen-di-cheng-fa-liao.html
	05_07_octopress-add-description-keywords-plugin-optimization.html
	05_08_add-descritpion-and-keywords-for-octopress-site-plugin-v3.html
	05_08_add-original-link.html
	05_08_ta-li-ban-zhao-mu-de-5ge-bu-zou-tedshi-pin.html
	05_11_do-you-remember-that-game-on-linux.html
	05_13_<<bei-lun-13>>-guan-gan.html
	05_13_xue-dao-liao-liang-ge-li-lun.html
	05_14_about-the-translation-category.html
	05_15_chakra-linux-bundlesystembei-extraku-qu-dai.html
	05_20_ma-nong-di-wu-qi-2013-4-18.html
	05_23_asm-dot-js-javascriptde-zi-ji.html
	05_24_di-[?]-ge-javascriptxiang-mu-yong-yu-kuang-wu-li-du-fen-xi.html
	05_25_kai-shi-shi-yong-an-quan-bao-cdnfu-wu-liao.html
	05_27_jian-ding-bu-yi-di-xue-xi-he-shi-yong-javascript.html
	05_29_zai-codecademyshang-huo-de-de-xun-zhang.html
	05_30_tui-bei-tu-di-wu-liu-xiang-ji-wei-kun-xia-kan-shang-bi.html
	05_31_zhong-guo-shi-da-yu-yan-shu-tui-bei-tu-,-mo-nian-ge-,-ma-qian-ke-zheng-li-fen-xiang.html
	06_02_xin-jiao-gui-jing-yan-fen-xiang.html
	06_04_xue-che-ji-1.html
	06_11_starkjia-zu-de-fu-mie-zhen-shi-yin-wei-bu-gou-hou-hei-ma.html
	06_12_ru-he-xia-zai-bai-du-yin-le.html
	06_13_cha-zhi-suan-fa-javascriptshi-xian.html
	06_15_hu-jiao-zhuan-yi-xi-tong-yuan-dai-ma-bo-le-zai-xian-bian-cheng-tiao-zhan-sai.html
	06_20_ma-nong-di-liu-qi.html
	06_22_qi-li-bei-zu-qiu-sai-16qiang.html
	06_23_bi-sai-ji.html
	06_25_[?]-yuan-xian-xing-hui-gui-fen-xi.html
	06_25_da-shi-feng-fan.html
	06_25_zhong-xuan-mo-ni-zhong-xuan-shu-xue-mo-xing.html
	06_27_binixhe-bearfoxting-zhi-geng-xin.html
	06_27_fang-zou-guang-zi-xing-che-zuo-yi.html
	07_06_wo-de-gui-ya-chuang-(meng-yin-yao-)gan-shou.html
	07_13_shi-xi-di-[?]-tian.html
	07_14_cheng-jiao-xuan-mei-han-gai-kuang.html
	07_15_cheng-jian-xuan-mei-han-quan-chang-can-guan-ji-lu.html
	07_16_cheng-jiao-xuan-mei-han-chu-zhuang-yun-che-jian-he-yuan-mei-zhun-bei-che-jian.html
	07_17_zhen-dong-shai-xiu-li.html
	07_18_40.html
	07_18_chu-zhuang-yun-che-jian-shi-xi-ji-lu.html
	07_20_51.html
	07_20_zui-jin-ji-tian-shi-xi-de-gan-wu.html
	07_21_69.html
	07_21_89.html
	07_21_zhu-xuan-che-jian-he-cang-ku.html
	07_22_yuan-mei-che-jian.html
	07_23_134.html
	07_23_139.html
	07_23_142.html
	07_23_148.html
	07_23_mang-dang-shan-you-ji-1.html
	07_24_35she-shi-du-de-ci-xuan-gang-wei.html
	07_25_182.html
	07_25_221.html
	07_25_225.html
	07_25_mang-dang-shan-jian-jie.html
	07_25_mang-dang-shan-yi-wen-hua-lu-you-qu-di-tu.html
	07_26_cheng-jiao-xuan-mei-han-nong-suo-,-beng-fang.html
	07_27_jia-ya-guo-lu.html
	07_28_238.html
	07_28_241.html
	07_28_zhi-jian-shi-xi.html
	07_29_251.html
	07_29_271.html
	07_29_275.html
	07_29_278.html
	08_01_da-yu-xia-de-gang-wei.html
	08_02_310.html
	08_02_313.html
	08_02_318.html
	08_02_328.html
	08_03_353.html
	08_03_356.html
	08_04_hou-san-ge-gang-wei-zhong-xuan-tuo-jie-diao-du.html
	08_05_362.html
	08_05_365.html
	08_05_jv-ji-xuan-mei-han-can-guan.html
	08_06_370.html
	08_06_389.html
	08_07_395.html
	08_07_398.html
	08_07_xin-zhuang-xuan-mei-han-shi-xi.html
	08_09_402.html
	08_09_405.html
	08_09_408.html
	08_09_410.html
	08_09_415.html
	08_10_420.html
	08_12_cheng-jiao-xuan-mei-han-she-bei-zuo-yong-zong-jie.html
	08_15_424.html
	08_15_429.html
	08_15_433.html
	08_15_mang-dang-shan-you-ji-2.html
	08_20_mang-dang-shan-you-ji-3.html
	08_25_447.html
	08_25_456.html
	08_26_464.html
	08_26_466.html
	08_26_470.html
	09_02_zi-chan-bu-hui-xiang-xiao.html
	09_06_di-[?]-ci-lai-dao-kuang-da-tuan-qi.html
	09_13_557.html
	09_14_577.html
	09_14_583.html
	09_14_595.html
	09_15_601.html
	09_24_611.html
	09_24_jin-tian-zuo-liao-[?]-jian-hao-shi-ye-shi-[?]-jian-diao-si-qi-shi-zu-de-hao-shi.html
	09_25_a-very-important-thing-usability-of-os.html
	09_25_zhun-bei-gong-xiang-[?]-xie-zi-ji-de-tu-fa-qi-xiang.html
	09_27_why-we-should-not-criticize-others.html
	10_01_some-tv-series-with-me.html
	10_05_qing-hua-da-xue-zai-xian-ke-cheng-dian-lu-yuan-li-di-[?]-jiang-edx.html
	10_05_zhong-guo-gu-dai-li-shi-yu-ren-wu-[nil][nil]qin-shi-huang.html
	10_06_626.html
	10_06_632.html
	10_06_something-shared-in-baidu-about-bible-or-christian.html
	10_08_645.html
	10_09_backyard-brains-sai-bo-zhang-lang-roboroach-number-12.html
	10_10_i-found-a-website.html
	10_10_ma-nong-di-qi-qi.html
	10_13_the-best-bible-app-i-found.html
	10_14_jin-tian-ting-dian-liao-,wo-fa-xian.html
	10_18_liu-bei-wei-shi-yao-yao-da-yi-ling-zhi-zhan-?.html
	10_18_zui-jin-ji-tian-mian-shi-de-dao-de-jing-yan.html
	10_19_bo-yi-lun-san-ge-qiang-shou-de-qiang-zhan.html
	10_20_jin-tian-de-mian-shi-jing-yan.html
	10_21_651.html
	10_22_remove-the-qrcode-in-lower-right-area.html
	10_24_fang-tuo-luo-xiao-bao-zhi-jin-she-ji.html
	10_26_ma-nong-di-ba-qi-mian-shi.html
	10_27_658.html
	10_27_some-mooc-website.html
	10_27_these-days-i-write-just-a-few-blogs.html
	10_28_2011-2012-kuang-da-guan-li-xue-shi-juan.html
	10_28_2011-2012kuang-da-guan-li-xue-shi-ti-can-kao-da-an.html
	10_28_i-did-a-fool-thing.html
	10_31_bi-ye-sheng-qiu-zhi-xiao-yuan-zhao-pin-xin-xi-ji-he.html
	11_01_673.html
	11_02_miracle-wo-zhen-shi-bu-pei.html
	11_03_ru-he-cai-shi-zhong-sheng-,ru-he-cai-shi-zhen-xin-?.html
	11_03_yi-sa-qu-qi-chuang-shi-ji-24.html
	11_05_680.html
	11_05_687.html
	11_05_690.html
	11_05_705.html
	11_07_718.html
	11_09_hei-ke-di-guo-ji-dian-tips.html
	11_09_jin-tian-de-bai-bing-ju-hui.html
	11_10_wo-bing-chi-de-seoyuan-ze.html
	11_11_androidkai-fa-de-si-kuan-ide.html
	11_11_game-time-limited-in-21-hours-a-week.html
	11_14_i-did-a-wrong-thing.html
	11_14_mang-dang-shan-you-ji-4.html
	11_16_golang-resource.html
	11_16_goyu-yan-zhi-lu-22.html
	11_17_goyu-yan-de-zhi-zhen.html
	11_23_724.html
	11_23_goyu-yan-fu-zhi-ni-zi-ji.html
	11_23_one-day-one-golang.html
	11_23_tuan-qi-ju-hui-xi-li.html
	11_23_yue-qi-bei-bai-ke-zhi-shi-jing-sai.html
	11_24_goyu-yan-er-fen-cha-zhao.html
	11_25_di-[?]-ci-can-jia-chen-dao.html
	11_25_one-day-one-golang-25.html
	11_26_goyu-yan-fu-shu-complex.html
	11_26_ma-tai-fu-yin-18-4.html
	11_27_shu-zu-goyu-yan.html
	11_28_730.html
	11_28_goyu-yan-qie-pian.html
	11_29_734.html
	11_29_goyu-yan-zhi-zhen.html
	11_30_one-day-one-golang-11-dot-30.html
	12_01_[?]-ge-meng.html
	12_01_duo-xiang-fu-zhi.html
	12_02_goyu-yan-forxun-huan.html
	12_02_goyu-yan-go1-dot-2.html
	12_02_goyu-yan-zhong-ifyu-ju-[?]-chu-yi-wen.html
	12_03_goyu-yan-liang-chong-fan-hui-fang-shi.html
	12_04_bi-bao-closureyu-dui-heap.html
	12_04_dian-ying-tui-jian-pi-wei-lai.html
	12_04_mi-wu-slash-wu-di-yi-sha-suo-biao-shu-de-shi-wu-shen-guan-dian-ma-?.html
	12_05_738.html
	12_05_goyu-yan-deferya-hou.html
	12_06_goyu-yan-wang-luo-zi-yuan-fen-xiang.html
	12_07_goyu-yan-fang-fa.html
	12_07_tuan-qi-ju-hui-qing-yu-,-mi-lian-,-zhen-ai.html
	12_09_goyu-yan-mapying-she.html
	12_10_742.html
	12_10_746.html
	12_10_748.html
	12_10_goyu-yan-12yue-10ri.html
	12_10_there-is-also-a-mandela-in-china.html
	12_11_goyu-yan-lei-xing-duan-yan.html
	12_12_goyu-yan-fan-she-reflect.html
	12_13_box-webdav-http-not-found-error.html
	12_13_goyu-yan-playground.html
	12_16_blenderxin-kai-yuan-duan-pian.html
	12_16_zai-androidxia-yun-xing-goyu-yan-cheng-xu.html
	12_17_752.html
	12_17_757.html
	12_17_goyu-yan-jin-tian-de-yue-du-zhuang-kuang.html
	12_17_i-started-to-read-the-pilgrims-progress.html
	12_21_sheng-dan-jie-zhu-ti-de-ju-hui.html
	12_22_ma-nong-di-jiu-qi.html
	12_23_764.html
	12_25_767.html
	12_30_771.html
	atom.xml
	bearfox/index.html
	binix-baham-linux-os/index.html
	blog/archives/index.html
	blog/categories/android/atom.xml
	blog/categories/android/index.html
	blog/categories/announcement/atom.xml
	blog/categories/announcement/index.html
	blog/categories/baham-studio/atom.xml
	blog/categories/baham-studio/index.html
	blog/categories/baham/atom.xml
	blog/categories/baham/index.html
	blog/categories/bible/atom.xml
	blog/categories/bible/index.html
	blog/categories/blender/atom.xml
	blog/categories/blender/index.html
	blog/categories/book/atom.xml
	blog/categories/book/index.html
	blog/categories/bridge/atom.xml
	blog/categories/bridge/index.html
	blog/categories/cg/atom.xml
	blog/categories/cg/index.html
	blog/categories/chromiumos/atom.xml
	blog/categories/chromiumos/index.html
	blog/categories/coal/atom.xml
	blog/categories/coal/index.html
	blog/categories/code/atom.xml
	blog/categories/code/index.html
	blog/categories/cumt/atom.xml
	blog/categories/cumt/index.html
	blog/categories/driving/atom.xml
	blog/categories/driving/index.html
	blog/categories/edu/atom.xml
	blog/categories/edu/index.html
	blog/categories/experience/atom.xml
	blog/categories/experience/index.html
	blog/categories/faith/atom.xml
	blog/categories/faith/index.html
	blog/categories/fate/atom.xml
	blog/categories/fate/index.html
	blog/categories/firewall/atom.xml
	blog/categories/firewall/index.html
	blog/categories/football-game/atom.xml
	blog/categories/football-game/index.html
	blog/categories/game-theory/atom.xml
	blog/categories/game-theory/index.html
	blog/categories/game/atom.xml
	blog/categories/game/index.html
	blog/categories/geek/atom.xml
	blog/categories/geek/index.html
	blog/categories/github/atom.xml
	blog/categories/github/index.html
	blog/categories/golang/atom.xml
	blog/categories/golang/index.html
	blog/categories/google/atom.xml
	blog/categories/google/index.html
	blog/categories/hack/atom.xml
	blog/categories/hack/index.html
	blog/categories/history/atom.xml
	blog/categories/history/index.html
	blog/categories/humanity/atom.xml
	blog/categories/humanity/index.html
	blog/categories/ideas/atom.xml
	blog/categories/ideas/index.html
	blog/categories/index.html
	blog/categories/internship/atom.xml
	blog/categories/internship/index.html
	blog/categories/java-zone/atom.xml
	blog/categories/java-zone/index.html
	blog/categories/java/atom.xml
	blog/categories/java/index.html
	blog/categories/javascript/atom.xml
	blog/categories/javascript/index.html
	blog/categories/job/atom.xml
	blog/categories/job/index.html
	blog/categories/linux/atom.xml
	blog/categories/linux/index.html
	blog/categories/management/atom.xml
	blog/categories/management/index.html
	blog/categories/memo/atom.xml
	blog/categories/memo/index.html
	blog/categories/mensa/atom.xml
	blog/categories/mensa/index.html
	blog/categories/mineral-processing/atom.xml
	blog/categories/mineral-processing/index.html
	blog/categories/mooc/atom.xml
	blog/categories/mooc/index.html
	blog/categories/movie/atom.xml
	blog/categories/movie/index.html
	blog/categories/ms/atom.xml
	blog/categories/ms/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/ruby/atom.xml
	blog/categories/ruby/index.html
	blog/categories/sagemath/atom.xml
	blog/categories/sagemath/index.html
	blog/categories/secure/atom.xml
	blog/categories/secure/index.html
	blog/categories/seo/atom.xml
	blog/categories/seo/index.html
	blog/categories/share/atom.xml
	blog/categories/share/index.html
	blog/categories/software/atom.xml
	blog/categories/software/index.html
	blog/categories/technology/atom.xml
	blog/categories/technology/index.html
	blog/categories/ted/atom.xml
	blog/categories/ted/index.html
	blog/categories/thinking/atom.xml
	blog/categories/thinking/index.html
	blog/categories/tips/atom.xml
	blog/categories/tips/index.html
	blog/categories/translation/atom.xml
	blog/categories/translation/index.html
	blog/categories/travel/atom.xml
	blog/categories/travel/index.html
	blog/categories/tv/atom.xml
	blog/categories/tv/index.html
	blog/categories/utb/atom.xml
	blog/categories/utb/index.html
	blog/categories/video/atom.xml
	blog/categories/video/index.html
	blog/categories/wordpress/atom.xml
	blog/categories/wordpress/index.html
	blog/page/10/index.html
	blog/page/11/index.html
	blog/page/12/index.html
	blog/page/13/index.html
	blog/page/14/index.html
	blog/page/15/index.html
	blog/page/16/index.html
	blog/page/17/index.html
	blog/page/18/index.html
	blog/page/19/index.html
	blog/page/2/index.html
	blog/page/20/index.html
	blog/page/21/index.html
	blog/page/22/index.html
	blog/page/23/index.html
	blog/page/24/index.html
	blog/page/25/index.html
	blog/page/26/index.html
	blog/page/27/index.html
	blog/page/28/index.html
	blog/page/29/index.html
	blog/page/3/index.html
	blog/page/30/index.html
	blog/page/31/index.html
	blog/page/32/index.html
	blog/page/33/index.html
	blog/page/34/index.html
	blog/page/35/index.html
	blog/page/36/index.html
	blog/page/37/index.html
	blog/page/38/index.html
	blog/page/39/index.html
	blog/page/4/index.html
	blog/page/40/index.html
	blog/page/41/index.html
	blog/page/42/index.html
	blog/page/43/index.html
	blog/page/44/index.html
	blog/page/45/index.html
	blog/page/46/index.html
	blog/page/47/index.html
	blog/page/48/index.html
	blog/page/49/index.html
	blog/page/5/index.html
	blog/page/50/index.html
	blog/page/51/index.html
	blog/page/52/index.html
	blog/page/53/index.html
	blog/page/54/index.html
	blog/page/6/index.html
	blog/page/7/index.html
	blog/page/8/index.html
	blog/page/9/index.html
	contactme-en/index.html
	contactme/index.html
	feeds/index.html
	friendly-links/index.html
	index.html
	license/index.html
	links/index.html
	sitemap.xml
	some-blogs-i-usually-visit/index.html
	verse/index.html