Merge pull request #1 from malbolgias/dev

Dev
Merge pull request #2 from malbolgias/dev

Archivos faltantes.
Merge pull request #3 from malbolgias/dev

Cambio texto botton principal
Update .gitignore
Merge branch 'master' into orchestrate

Conflicts:
	.gitignore