change some names
Merge branch 'antlr4-contexts-example' of github.com:mauriceoc/antlr4-contexts-example into antlr4-contexts-example

Conflicts:
	src/main/java/org/antlrfun/Error.java
	src/main/java/org/antlrfun/Main.java
	src/main/java/org/antlrfun/MyErrorStrategy.java