changed karin.txt by jasmin
done
karin.txt changed
merge conflict behoben
merge conflict nochmal behoben