nouvelle animation de surf pour les meduses
Merge branch 'master' of https://github.com/Waidd/GGJ2014

Conflicts:
	Assets/Scenes/scene_waidd.unity