Merge branch 'develop'
Merge branch 'master' of https://github.com/Bergmam/DAT255 into develop
added 3 cards
added 3 more cards
added JokerCards
Merge branch 'develop' of https://github.com/Bergmam/DAT255 into develop