inicio Properties
inicio Properties
Merge Master/master

Conflicts:
	src/Controller/config.txt