ReEdit cardsInDeck
Merge branch 'master' of https://github.com/Kukambara/worldofzaar

Conflicts:
	target/classes/com/worldofzaar/service/DeckService.class
	target/classes/com/worldofzaar/service/UserService.class
fixing Duel
Merge branch 'master' of https://github.com/Kukambara/worldofzaar
Something