Merge branch 'gh-pages' into develop
interim change
Completion of the 'beating yourself up' gallery
Merge branch 'develop' into gh-pages