Ajustos i proves
Merge branch 'master' of https://github.com/mydocumenta/3.0

Conflicts:
	.gitignore