blablabla

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>
Merge branch 'master' of https://github.com/Nepetalactone/Konzepte

Conflicts:
	just/bin/javacc/JUSTGrammar.jj
	just/src/javacc/JUSTGrammar.jj