added html/css to index page
fixed conflicts