Bruleur added
Merge branch 'master' of https://github.com/Dorvaryn/zerozeroduck

Conflicts:
	zerozeroduck/src/fr/odai/zerozeroduck/model/World.java