mostly there
Merge remote-tracking branch 'origin/master'

l
Revert "mostly there"

This reverts commit 33581f0f0b0d763e2ff860c2d25a0de7b7467e33.

Conflicts:
	hw1.sml