merging into develop from master
updated index.html per HW6