syning stuff
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git

Conflicts:
	rookGame/src/com/rookwithfriends/game/CardRank.java
	rookGame/src/com/rookwithfriends/game/Game.java