begin working on "play", but forgot I hadn't pulled discard.  now to merge
resolving conflicts, I think?

Merge branch 'master' of https://github.com/ccasin/Hanabi

Conflicts:
	Handler/Hanabi.hs
	yesod-devel/ghcargs.txt