first edits in index.html
copied most code
Merge branch 'develop' into staging