Octopress init
Site updated at 2014-04-06 20:34:24 UTC
Merge branch 'master' of github.com:liangpig1/liangpig1.github.io

Conflicts:
	index.html