Mergekonflikt fix
Merge branch 'master' of https://LukeCodewalker:93kP5u3!sa@github.com/Karl-Queckfeldt/HelloCompiler.git
refractor