hw3
Merge branch 'gh-pages' of https://github.com/LexKlaus/htm237-homework3 into gh-pages

Conflicts:
	sass/styles.scss