test
Merge branch 'gh-pages' of github.com:izzy1993/Week2 into gh-pages

Conflicts:
	theoFolder/index.html