Merge branch 'master' of github.com:smacke/smacke.github.io
Merge branch 'master' of github.com:smacke/smacke.github.io