change the PlayingScene class
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/soen6441/ui/scene/PlayingScene.java