Merge branch 'master' of github.com:joeroot/delighted
Merge branch 'gh-pages'