stefan javacc
Merge branch 'master' of github.com:FHV-ITM13/Just-Language

Conflicts:
	Wachter_JustCompiler/bin/fhv/JustyGrammar.jj
	Wachter_JustCompiler/src/fhv/JustyGrammar.jj