Updated Index file for gh-pages
merged conflicts