new functions
Merge branch 'zz_local'

Conflicts:
	src/com/soen6441/ui/scene/PlayingScene.java
Tower Upgrade Bug Fixed

Tower Upgrade Bug Fixed
Merge branch 'master' into zz_local