javascript updated
index.html merge