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

Conflicts:
	src/com/cs301/cribbage/CbgLocalGame.java
	src/com/cs301/cribbage/MainActivity.java