Commit before pull
Merge branch 'master' of https://github.com/Rolom/medusa

Conflicts:
	JellyFish/Assets/Resources/PlactomDieParticle.prefab
	JellyFish/JellyFish.userprefs
Reset to scenario with whale
Added Sound SFX Manager and interface to instance sounds (sounds not implemented yet)
Merge branch 'master' of https://github.com/Rolom/medusa

Conflicts:
	JellyFish/JellyFish.userprefs
no message
Merge branch 'master' of https://github.com/Rolom/medusa

Conflicts:
	JellyFish/JellyFish.userprefs
Merge branch 'master' of https://github.com/Rolom/medusa
Added SFX to Whale Animation, Death animation and RipleEffect