test case
Merge branch 'master' of https://github.com/sylhero/SOEN6441

Conflicts:
	SOEN6441/src/gamestate/PlayState.java
add test case
Merge branch 'master' of https://github.com/sylhero/SOEN6441