merging ace_count bastard branch

Feature/more than one deck