.
Merge branch 'master' of https://github.com/PatMosby/PI3-WS13

Conflicts:
	05/OrderedTree.hs