committing changes
Merge branch 'master' of https://github.com/jtraviesor/golden-pages