Made a day-two branch
almost fully explicit about what we're ignoring
can I break this?
really, can I break this?
Merge branch 'day-two'

Conflicts:
	.gitignore