trying to debug using the github deploy method
Merge branch 'master' into gh-pages