Did thngs
Merge branch 'master' of github.com:dcorwin/15237hw4
Hey this is a thing I guess?
Merge branch 'master' of github.com:dcorwin/15237hw4

Conflicts:
	static/style.css