Before type
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/vcs.xml
	.props.bat
	MathExpr.g
	generated/MathExpr.tokens
	generated/MathExprLexer.java
	generated/MathExprParser.java
	in.txt