Update with final project and index page
Merge branch 'Edits-21-May'