Edited some stuff
Merged index.html