Octopress init
Site updated at 2014-09-14 07:40:11 UTC
Site updated at 2014-09-14 08:01:39 UTC
Site updated at 2014-09-14 08:15:48 UTC
Octopress init
Site updated at 2014-09-15 05:41:53 UTC
Site updated at 2014-09-15 05:54:49 UTC
Merge branch 'master' of github.com:lifematrix/lifematrix.github.io

Conflicts:
	atom.xml
	sitemap.xml
cname
Site updated at 2014-09-15 06:36:06 UTC
Merge branch 'master' of github.com:lifematrix/lifematrix.github.io into source

 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
 合并到主题分支。

 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。