ignorar erros
Merge branch 'master' of https://github.com/thigambero/ubaduba

Conflicts:
	.gitignore
	error_log.txt