Added Lexer data type, stream index and recursive depth, updated traces, and aligned code for legibility.
Merge branch 'master' of https://github.com/dcastl2/haskell

Conflicts:
	match.hs