nuevos

nuevos cambios
Merge branch 'master' of https://github.com/richi2050/Jorch

Conflicts:
	css/stylo.css
	index.html
Merge branch 'master' of https://github.com/richi2050/Jorch