fixed repaint issues.  fixed skipped turns.
i think i fixed this files merge issues
Merge branch 'master' of https://github.com/yinfish/uno-is-great