Made test2 a bit more complicated. The inferencer and parser still handle it
 correctly.
Ternary test works now.

For sort, I'll first need to implement more involved pattern matching.
Merge branch 'master' of https://github.com/AardvarkSoup/HaskellControlFlow

Conflicts:
	src/HaskellControlFlow/Calculus/Formatter.hs