Octopress init
Site updated at 2014-05-25 17:06:10 UTC
Merge branch 'master' of github.com:vincenttam/vincenttam.github.io

This merge is not meant to be a merge.  I only want the command "rake
deploy" work..

Conflicts:
	about/index.html
	about/ode_src.html
	about/source-code-of-my-thoughts-on-ncr.html
	about/src-of-ven-det.html
	atom.xml
	blog/2014/02/16/my-first-octopress-post/index.html
	blog/2014/02/22/extend-notebook-lifespan/index.html
	blog/2014/03/01/git-status-of-my-octopress-folder/index.html
	blog/2014/03/02/a-vim-lover-page/index.html
	blog/2014/03/02/creating-a-new-octopress-page/index.html
	blog/2014/03/15/a-low-tech-approach-to-a-high-tech-problem/index.html
	blog/2014/03/15/complicated-pandoc-commands/index.html
	blog/2014/03/15/using-gvim-on-windows-to-create-pandoc-slides/index.html
	blog/2014/03/16/latex-template-for-essays/index.html
	blog/2014/03/22/jump-to-latex-syntax-error/index.html
	blog/2014/03/30/testing-jquery-image-popup/index.html
	blog/2014/04/05/latex-template-for-chin-essays/index.html
	blog/2014/04/27/gimp-transparent-background/index.html
	blog/2014/04/27/octopress-category-list/index.html
	blog/2014/05/24/using-mathjax-in-category-list-entries/index.html
	blog/2014/05/25/fixing-a-vim-error-caused-by-an-ultrablog-dot-vim-upgrade/index.html
	blog/archives/index.html
	blog/categories/$-slash-rm-slash-latex$/atom.xml
	blog/categories/$-slash-rm-slash-latex$/index.html
	blog/categories/css/atom.xml
	blog/categories/css/index.html
	blog/categories/gimp/atom.xml
	blog/categories/gimp/index.html
	blog/categories/hardware/atom.xml
	blog/categories/hardware/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/pandoc/atom.xml
	blog/categories/pandoc/index.html
	blog/categories/template/atom.xml
	blog/categories/template/index.html
	blog/categories/vim/atom.xml
	blog/categories/vim/index.html
	blog/page/2/index.html
	downloads/code/vendermonde_det.tex
	index.html
	javascripts/ender.js
	javascripts/libs/ender.js
	robots.txt
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-05-25 17:19:36 UTC