Commit antes de PULL en pc-maik

-Maik
Merge branch 'master' of https://github.com/RubenSerradas/Guava

Conflicts:
	GuavaParser.yy
Nuevas funciones.

> Abstraen comportamientos comunes en las reglas de la gramatica.

-Maik
Merge branch 'master' of https://github.com/RubenSerradas/Guava into maik
Merge branch 'master' of https://github.com/RubenSerradas/Guava

Conflicts:
	GuavaParser.yy
Merge branch 'maik'