Update index.html
Merge pull request #11 from staycebella/gh-pages

Merge pull request #10 from staycebella/master
Updated merge conflict
Merge branch 'master' into gh-pages

Conflicts:
	index.html