fix
Merge branch 'master' of https://github.com/Kokxer/kokxer.github.io

Conflicts:
	author/kele.html
	author/kele2.html
	author/kele3.html
	can-bus-quick-introduction.html
	canoe-tutoiral-part-1.html
	canoe-tutorial-part-2.html
	canoe-tutorial-part-3.html
	categories.html
	category/bo-ke-ri-zhi.html
	category/ji-suan-ji.html
	category/misc.html
	category/ying-jian-kai-fa.html
	category/you-xi.html
	category/zhe-teng.html
	disqus-is-back.html
	do-not-touch-css.html
	drafts/poster-girl.html
	easy-zynq-soft-dev-guide.html
	fuck-blackberry.html
	hello-world.html
	index.html
	index2.html
	index3.html
	init-commit.html
	jekyll-on-windows.html
	netgear-r6300v2-dd-wrt.html
	neu6-easy.html
	pages/about.html
	something-about-epub.html
	tag/blackberry.html
	tag/blog.html
	tag/btneu6educn.html
	tag/can.html
	tag/canoe.html
	tag/css.html
	tag/dd-wrt.html
	tag/disqus.html
	tag/epub.html
	tag/falcom.html
	tag/hexo.html
	tag/javascript.html
	tag/jekyll.html
	tag/make.html
	tag/makefile.html
	tag/numix.html
	tag/phone.html
	tag/r6300v2.html
	tag/soc.html
	tag/ubuntu.html
	tag/vivado.html
	tag/web.html
	tag/yi-su.html
	tag/zedboard.html
	tags.html
	update-1.html
	update-to-ubuntu1404.html
	use-makefile-on-windows.html
	vivado-2014-1.html
	vivado-hook-scripts.html
	ys-foliage-ocean-in-celceta.html
	zedboard-bring-up-guide.html