IGNORE
IGNORAR!!!
Merge branch 'master' of github.com:josebsancheze/Cobros-ITLA

Conflicts:
	.gitignore