cleanup
Merge branch 'master' of github.com:Ringil/Cribbage

Conflicts:
	Cribbage.cpp
	makefile