comit inicial
Merge remote-tracking branch 'consultasv3/master'

Conflicts:
	.gitignore