still trying to get another project to merge
Merge branch 'master' of https://github.com/EthanSoch/CSC324-Team-1.git

Conflicts:
	rookwithfriends/src/rook/CardSet.java
	rookwithfriends/src/rook/Game.java
	rookwithfriends/src/rook/Player.java