more cards
Merge branch 'master' of https://github.com/HS-Project/HS-Development

Conflicts:
	CardGame/src/cardgame/Card.java