Octopress init
Site updated at 2014-03-19 01:35:55 UTC
Site updated at 2014-03-19 02:30:08 UTC
Update header info
Merge branch 'master' of https://github.com/dankleiman/dankleiman.github.io into source
updating _config.yml
resolving merge issue