Added some things
resolved conflicting index.html