Added index.html
Resolved conflict and merged into working branch