iginore
Merge remote-tracking branch 'refs/remotes/origin/Humberto' into master-2

Conflicts:
	.gitignore