Add .gitignore
Fix sheetaholics url error

Conflicts:
	archives.html
	author/j-s-liang.html
	author/j-s-liang10.html
	author/j-s-liang11.html
	author/j-s-liang12.html
	author/j-s-liang13.html
	author/j-s-liang2.html
	author/j-s-liang3.html
	author/j-s-liang4.html
	author/j-s-liang5.html
	author/j-s-liang6.html
	author/j-s-liang7.html
	author/j-s-liang8.html
	author/j-s-liang9.html
	author/jsliang.html
	author/jsliang2.html
	categories.html
	category/blog.html
	category/blog10.html
	category/blog11.html
	category/blog12.html
	category/blog13.html
	category/blog14.html
	category/blog2.html
	category/blog3.html
	category/blog4.html
	category/blog5.html
	category/blog6.html
	category/blog7.html
	category/blog8.html
	category/blog9.html
	feeds/Blog.atom.xml
	feeds/all-zh.atom.xml
	feeds/all.atom.xml
	feeds/blog.atom.xml
	index.html
	index10.html
	index11.html
	index12.html
	index13.html
	index14.html
	index2.html
	index3.html
	index4.html
	index5.html
	index6.html
	index7.html
	index8.html
	index9.html
	tag/.html.html
	tag/a-gen-ting-tan-ge.html
	tag/a-la-bo-wen.html
	tag/acg.html
	tag/asus.html
	tag/autojump.html
	tag/aws.html
	tag/bands.html
	tag/bash.html
	tag/bootstrap.html
	tag/canon-eos-500d.html
	tag/canon-eos-500d2.html
	tag/canon.html
	tag/canon2.html
	tag/chong-wu.html
	tag/coolpix-s220.html
	tag/couple.html
	tag/d80.html
	tag/ding-ban.html
	tag/django.html
	tag/dmc-zs3.html
	tag/dong-man.html
	tag/du-pi-wu.html
	tag/ec2.html
	tag/english.html
	tag/eos-500d.html
	tag/eos-500d2.html
	tag/f188.html
	tag/facebook.html
	tag/fo-lang-ming-ge.html
	tag/ge-ci.html
	tag/ge-ci2.html
	tag/git.html
	tag/github-pages.html
	tag/github.html
	tag/gong-zuo.html
	tag/google.html
	tag/gou-wu.html
	tag/gou-zhen.html
	tag/html.html
	tag/hun-jie.html
	tag/javascript.html
	tag/jewelry.html
	tag/ji-shu-bi-ji.html
	tag/jie-hun.html
	tag/jscolor.html
	tag/jspdf.html
	tag/latex.html
	tag/linux.html
	tag/lu-you.html
	tag/mac.html
	tag/mercurial-hg.html
	tag/movie.html
	tag/nctu.html
	tag/necklaces.html
	tag/nginx.html
	tag/nikon.html
	tag/nthu.html
	tag/olympus-xz-1.html
	tag/olympus.html
	tag/optio-a36.html
	tag/os-x.html
	tag/pad.html
	tag/padfone-2-station.html
	tag/padfone-2.html
	tag/panasonic.html
	tag/pelican.html
	tag/pentax-optio-a36.html
	tag/pentax.html
	tag/phone.html
	tag/picasa.html
	tag/project-365.html
	tag/pyinstaller.html
	tag/pypdf.html
	tag/python.html
	tag/pywin32.html
	tag/qi-qun-ke-ji.html
	tag/qing-lu-xie-zhen.html
	tag/reportlab.html
	tag/ri-ben-yu.html
	tag/ri-ben-yu2.html
	tag/rings.html
	tag/she-ying.html
	tag/she-ying2.html
	tag/she-ying3.html
	tag/sheetaholics.html
	tag/shell.html
	tag/sheng-huo.html
	tag/shi.html
	tag/shou-gong-yi.html
	tag/sql.html
	tag/sublime-text.html
	tag/svglib.html
	tag/tai-bei.html
	tag/tai-bei2.html
	tag/tai-zhong.html
	tag/thailand.html
	tag/tortoisehg.html
	tag/tu-feng-wu.html
	tag/ubuntu.html
	tag/wedding.html
	tag/wen-ju.html
	tag/wordpress.html
	tag/wotancraft.html
	tag/wxformbuilder.html
	tag/wxpython.html
	tag/xi-ju.html
	tag/xiang-ji-bao.html
	tag/xin-qing.html
	tag/xin-qing2.html
	tag/xin-qing3.html
	tag/xin-qing4.html
	tag/xin-zhu.html
	tag/xz-1.html
	tag/yan-jiu-suo.html
	tag/yin-le.html
	tag/yin-le2.html
	tag/yue-du.html
	tag/zhao-pian.html
	tag/zhao-pian2.html
	tag/zhao-pian3.html
	tag/zhao-pian4.html
	tag/zillians.html
	tag/zte.html
	tags.html