Merge branch 'master' of https://github.com/paulroseau/HaskJack

Conflicts:
	Cards.hs