Automated commit at 2014-09-24 16:52:46 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 16:53:41 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 16:54:46 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 16:59:56 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 17:03:01 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 17:04:36 UTC by middleman-deploy 0.2.3
Automated commit at 2014-09-24 17:06:11 UTC by middleman-deploy 0.2.3
test
Merge branch 'master' of github.com:zeriyu/blog

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'gh-pages' of github.com:zeriyu/blog
wtf