some fixes
merge
player cards implemented
olollo
Merge branch 'master' of github.com:PristupaPV/imaginarium