Merge branch 'cwilli13'

Conflicts:
Card.php
Deck.php
Game.php
Pawn.php
Merge branch 'master' of https://github.com/viktroy/SorryProject

Conflicts:
	Card.php
	Deck.php
	Game.php
	Pawn.php