Removed mushroom (only from generator !)
Merge branch 'master' of https://github.com/Zylann/FatAndFurious

Conflicts:
	FaFGenerator.cpp