Octopress init
Resolved conflicts
Site updated at 2013-12-04 10:50:33 UTC
Pulled remote master
Site updated at 2013-12-04 10:59:38 UTC