Added to card.h and .m
..
Merge remote-tracking branch 'origin/master'