pushing index.html
fixed conflicts from farzad