ui::text::Bidding
Merge branch 'master' of github.com:phantom10111/BridgeTCS3

Conflicts:
	src/model/Deal.cpp
	src/model/Deal.hpp
Merge branch 'master' of github.com:phantom10111/BridgeTCS3