code cleaning and commenting index.html
resolving conflicts :(
:(