my version, but i want niks version
Merge branch 'master' of https://github.com/hbrice/homework4

Conflicts:
	program.sml