More detailed error messages
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/GameLogic.cc
Merge branch 'master' of https://github.com/Zpiritual/fluxx