Loucuras!!!

Conflicts:
	Universales/StageState.cpp
	Universales/StageState.cpp.orig
	Universales/StateData.cpp
	Universales/config.bin
	Universales/save.bin