try to fix
Merge branch 'Klim' of https://github.com/WhyNotZoidberg/SW6Parrot into Klim

Conflicts:
	Source/workspace/PARROT/gen/.gitignore