Förklaring i card
Merge branch 'Emily'

Conflicts:
	Card.java