Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR
Merge branch 'sara' of github.com:alu4102/p5AnalizadorDPR
Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR
Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR
Merge branch 'Adrian' of github.com:alu4102/p5AnalizadorDPR into sara
Modificada la gramática en la página
Merge branch 'sara' of github.com:alu4102/p5AnalizadorDPR into Adrian

Conflicts:
	views/grammar.slim