Adding pages
updated index
Merge branch 'gh-pages'

Conflicts:
	index.html
Update index.html
git