HW6 index.html
Merge branches 'develop' and 'staging' into staging