added index.html
Fix conflict
Final commit for index page
Merge branch 'release2'