merged stable
Merge branch 'master' of https://github.com/Bilb/projet-VI51

Conflicts:
	src/Lemming/Agent/Lemming.java
Merge branch 'master' of https://github.com/Bilb/projet-VI51
MERGREEEEEEE