Initial commit
Resolve conflict on index.html