Merge pull request #7 from TaviscaSolutions/master

merging gh pages and master
Update index.html
Merge branch 'gh-pages' of https://github.com/TaviscaSolutions/red-repo

Conflicts:
	index.html
First commit for javascript assignment