Octopress init
Site updated at 2014-09-26 13:36:04 UTC
Merge branch 'master' of github.com:marklee77/marklee77.github.io

Conflicts:
	atom.xml
	blog/2013/06/22/creating-web-pages-with-template-render/index.html
	blog/2013/06/27/creating-nfs-root-vmware-virtual-machines-from-the-linux-command-line/index.html
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-09-26 13:37:44 UTC