Added link to gh-pages
Merge branch 'js-test', resolved conflict

Conflicts:
	index.html