Try 1 on hw4-1
Try 2 on hw4-1
Changed index.html
Fixed conflict
Changed index.html from new updates
Merge branch 'develop' into staging