some progress
Merge branch 'master' of github.com:flangenegger/CompilerConstruction

Conflicts:
	04/MiniJava_1/src/ch/unibe/iam/scg/javacc/MiniJavaImpl.java