added index page
resolving merge conflicts