Ajustes
Merge branch 'diseño'

Conflicts:
	README.md
Merge branch 'master' into idar