Deal compiles
Merge branch 'master' of https://github.com/mike1729/BridgeTCS1

Conflicts:
	src/bridge/Deal.cpp