file delete added
file delete added
Merge branch 'master' of github.com:pooingx2/SecretGarden

Conflicts:
	src/com/sg/controller/StreamManager.java