had to commit some stuff
Merge branch 'master' of https://github.com/flangenegger/CompilerConstruction

Conflicts:
	project/MiniJava_1/jtb/ast/ArrayLookup.java
	project/MiniJava_1/jtb/ast/TermAnd.java
	project/MiniJava_1/jtb/ast/TermLessThan.java
	project/MiniJava_1/jtb/ast/TermMinus.java
	project/MiniJava_1/jtb/ast/TermMoreThan.java
	project/MiniJava_1/jtb/ast/TermMultiplication.java
	project/MiniJava_1/jtb/ast/TermPlus.java
	project/MiniJava_1/jtb/ast/TermPrimary.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/ArrayLookup.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermAnd.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermLessThan.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermMinus.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermMoreThan.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermMultiplication.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermPlus.java
	project/MiniJava_1/src/ch/unibe/iam/scg/minijava/ast/TermPrimary.java