ParaUly

No le llegaba
Equations 3.0

Parser not crashing
Merge branch 'master' of https://github.com/chidmdxx/SOFIA

Conflicts:
	SOFIA/src/mx/udlap/equations/EquationMethods.java
Merge branch 'master' of https://github.com/chidmdxx/SOFIA

Conflicts:
	SOFIA/src/mx/udlap/equations/EquationMethods.java