Merge pull request #3 from zhaozheid/master

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

Conflicts:
	src/com/soen6441/ui/scene/PlayingScene.java
Merge pull request #22 from joeyzhang1989/master

change PlayingScene Class