week 4 edits

discard these
I don’t like
Merge branch 'Wed' into wk3

Conflicts:
	404.html
	coffee.html