gitignore
Merge branch 'master' of https://github.com/juanrules/personaling_prototipo

Conflicts:
	.gitignore
Gestor y listado de campañas