Merge branch 'master' of /Users/nuclear/WebstormProjects/poker with conflicts.
add 5 card anim