Edited product desc in index.html
restored index.js
updated
index.js no problem
First Try

Merge branch 'develop' into staging
updated index.html
updated index.html

Merge branch 'develop' into staging
conflicts solved
index.html revised
index.html revised

Merge branch 'develop' into staging
Updated from staging

Merge branch 'staging'