More stuff
Merge branch 'master' of https://github.com/trowbrid16/Cribbage-Game

Conflicts:
.gitignore
asv