changes
Merge branch 'gh-pages' of https://github.com/MissCatLady/CSC309 into gh-pages

Conflicts:
	css/index.css