Primeras pruebas while
cambios menores
Merge remote-tracking branch 'origin/guillermo'

Conflicts:
	doc/gramatica.js
LOOPS Conseguidosgit add .
Merge remote-tracking branch 'origin/guillermo'