Merge branch 'master' of https://github.com/DRavnaas/CS5010_NotesEtc

Conflicts:
	Stephen/trees.rkt
Steve Update 2
Merged