Octopress init
Site updated at 2014-08-19 08:05:52 UTC
Site updated at 2014-08-19 08:39:10 UTC
Merge branch 'master' of github.com:mawenying/mawenying.github.io

Conflicts:
	index.html