Some Progress
old grammar push
Merge branch 'oldgram' of github.com:flangenegger/CompilerConstruction

Conflicts:
	project/MiniJava_1/jtb/MiniJavaIn.jj
	project/MiniJava_1/jtb/MiniJavaOut.jj
	project/MiniJava_1/jtb/visitor/DepthFirstVisitor.java
	project/MiniJava_1/jtb/visitor/GJDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJNoArguDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJNoArguVisitor.java
	project/MiniJava_1/jtb/visitor/GJVisitor.java
	project/MiniJava_1/jtb/visitor/GJVoidDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJVoidVisitor.java
	project/MiniJava_1/jtb/visitor/Visitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/javacc/MiniJava.jj
	project/MiniJava_1/src/ch/unibe/iam/scg/javacc/MiniJavaImpl.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/typechecker/TypeChecker.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/DepthFirstVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJNoArguDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJNoArguVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVoidDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVoidVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/Visitor.java
Merge branch 'master' of github.com:flangenegger/CompilerConstruction

Conflicts:
	project/MiniJava_1/jtb/MiniJavaOut.jj
	project/MiniJava_1/jtb/visitor/DepthFirstVisitor.java
	project/MiniJava_1/jtb/visitor/GJDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJNoArguDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJNoArguVisitor.java
	project/MiniJava_1/jtb/visitor/GJVisitor.java
	project/MiniJava_1/jtb/visitor/GJVoidDepthFirst.java
	project/MiniJava_1/jtb/visitor/GJVoidVisitor.java
	project/MiniJava_1/jtb/visitor/Visitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/javacc/MiniJava.jj
	project/MiniJava_1/src/ch/unibe/iam/scg/javacc/MiniJavaImpl.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/DepthFirstVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJNoArguDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJNoArguVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVoidDepthFirst.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/GJVoidVisitor.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/visitor/Visitor.java