spellign conflict.tex
Merge branch 'master' of https://github.com/Ekerholten/EIT-Gruppe-Blue-Box