a
Merge branch 'master' of https://github.com/arcnexus/RedFoX

Conflicts:
	configuracion.cpp