Merge branch 'gh-pages' into develop
Blog changes and google analytics for nicolathomas.com added
Merge branch 'develop' into gh-pages