almost part 1
Merge branch 'gh-pages' of https://github.com/ChristianMurphy/CST421-lab3 into gh-pages

Conflicts:
	index.html
	main.js