Minor changes to CardCollection and Card
Merge branch 'master' of https://github.com/alexhockley/Cards

Conflicts:
	src/cards/CardCollection.java