app ManagerDaChoto
Merge branch 'master' of https://github.com/AntonioBMR/ManagerDaChoto

Conflicts:
	.gitignore