some minor changes
deck test makefile fix
merge
Merge branch 'master' of https://github.com/mike1729/BridgeTCS1

Conflicts:
	Deck/test/DeckTest.cpp
Merge branch 'master' of https://github.com/kkll/BridgeTCS1
Play simplified