Improved parser
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/webs/kevkawmcode/Parser/EquationParser.java
Trying to fix conflict