Edited index.html
merged develop changes