HOMEWORK (again)
Merge branch 'gh-pages' of https://github.com/JustinBis/CS53-Website into gh-pages

Conflicts:
	style.css