Octopress init
Site updated at 2014-01-27 03:53:52 UTC
Site updated at 2014-01-27 04:07:17 UTC
Merge branch 'master' of https://github.com/Wallace-dyfq/Wallace-dyfq.github.io into source

Conflicts:
	_config.yml