323f241 Merge branch 'master' of github.com:nfriedly/nfriedly.com