element de decor rajouté fklhsdjfhsdjnfgsdfsedf
Merge branch 'master' into level_design

Conflicts:
	src/factory/Etage_Factory.cpp
	src/main.cpp