linking index page to correct html
merge conficts