Problem 93 from haskell wiki 99 questions
Merge branch 'master' of github.com:aflag/haskell-group

Conflicts:
	.gitignore