borrando archivos
Merge branch 'master' of https://github.com/johanp-345/Test

Conflicts:
	Test/app/css/estilos.css
	Test/index.html