merged
Merge branch 'master' of https://github.com/frosch03/stoffliste
leaving emacs files allone
added something