Updated index.html (removed bad merges from old version)
Merge pull request #13 from alaframboise/master

Removed old merge content from index.html