equilibrage
Merge branch 'master' of https://github.com/schobbent/JameShaker3_planet

Conflicts:
	Assets/Scripts/Capsule.cs
equilibrage 2