Octopress init
Site updated at 2013-09-14 02:30:16 UTC
Merge branch 'master' of https://github.com/njuxjy/njuxjy.github.com

Conflicts:
	atom.xml
	blog/2013/09/14/octopress-first-post/index.html
	blog/archives/index.html
	index.html
	sitemap.xml
Site updated at 2013-09-14 02:34:37 UTC