First Commit
Resolve conflicts in index.html