#4 Nage fonctionnelle
Merge branch 'master' of
https://github.com/FlorentMouysset/TerChallenge.git

Conflicts:
	musselgathering/src/com/foragers/mg/Assets.java