testshi1
testshi1
Merge remote-tracking branch 'origin/master'

1e8e6b593e285ac72af27e4f7c67084c.

Conflicts:
	Cardgame/Model/Card.h
shi1