finished Ex.2
Merge branch 'master' of https://github.com/cargillj/cs381_hw

Conflicts:
	hw3/Hw3.hs