Removed git conflict markers
Update index.md
Merge pull request #25 from karlbright/gh-pages

Removed git conflict markers from documentation