merge
Merge branch 'master' of https://github.com/ukupat/hearthstone
fixed Uku's refactoring