Update Field.java and Card.java
Merge branch 'master' of
https://github.com/Team4Game/de.htwg.se.setGame.git

Conflicts:
	de.htwg.se.SetGame/src/de/htwg/se/SetGame/Modul/Card.java