silly noob mistake
Merge branch 'master' into gh-pages
script writes git hash into js file
conflict