Merger test
Merge branch 'master' of github.com:petertr/haskell-learn

Conflicts:
	l1.hs