More tinkering
Merge branch 'gh-pages' of github.com:natetarrh/comp150 into gh-pages

Conflicts:
	index.html