Octopress init
Site updated at 2013-11-16 10:59:49 UTC
Site updated at 2013-11-16 12:42:21 UTC
Merge branch 'master' of github.com:lilinj2000/lilinj2000.github.io

Conflicts:
	atom.xml
	blog/archives/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css
Site updated at 2013-11-16 13:02:17 UTC