subset work

in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cribbage/src/DumbPlayer.cpp
Committed changes

work dangit
Merge remote-tracking branch 'origin/master'