Fix merge conflict in index.html
Merge pull request #12 from concreted/master

Fix merge conflict in index.html