should be ok
Merge branch 'master' of https://github.com/rensc/Cardgame

Conflicts:
	Cardgame/Model/Card.m