did hte for loop wrong
Merge branch 'master' into gh-pages
script writes git hash into js file
fixing conflict