added card +test
Merge branch 'master' of https://github.com/miofferg/de.htwg.se.dog.git

Conflicts:
	de.htwg.se.dog/src/de/htwg/se/dog/Doggame.java