merge
Altered Card to be immutable but it can now be subclasses.

Merge branch 'master' of
https://github.com/nothingatall544/CardsAgainstAgility.git

Conflicts:
	CardsAgainstAgility/src/com/adaba/MainActivity.java