SOME TESTING LIKE STUFF

ITS BROKEN ITS ALL BROKEN
Merge remote-tracking branch 'origin/master'

Conflicts:
	Phase10Test/src/edu/up/cs301/game/test/PhaseStateTest.java