Changes
Merge branch 'master' of https://github.com/karcs/haskell

Conflicts:
	MinEdit.hs
Changing main