revert by recommit!
Merge branch 'master' of github.com:coolaj86/blog.coolaj86.com