added links to index page
fixed merge conflict