adding more stuff to index.html from team 2
resolve conflict
resolve conflict on index.html by team 2