updated from web
Merge branch 'master' of https://github.com/DarkYodeler/about-me-octopress

Reconciling remote git with local.