Corregidos algunos errores
Merge branch 'sara' of github.com:alu4102/p5AnalizadorDPR into Adrian

Conflicts:
	views/grammar.slim
Merge branch 'Adrian'