finish website
Merge branch 'gh-pages' of https://github.com/amcmicken/project-01 into gh-pages

Conflicts:
	css/main.css
	index.html