ok.
Merge branch 'master' of https://github.com/MikeMalott/mikemalott.github.io

Conflicts:
	chicago/css/chistyle.css
	chicago/test.html
Done.  It’s allll fixed!