a different approach that didn't work out
Merge branch 'master' of https://github.com/jakeland/_website

Conflicts:
	about.html
	index.html
Merge branch 'master' of https://github.com/jakeland/_website
Merge branch 'master' of https://github.com/jakeland/_website
what?