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

Conflicts:
	Cribbage/gen/com/cs301/cribbage/R.java
stuff