Delete Bananenbrot

I´m gonna Delete the files in my branch that differ from the master branch in order to solve the merge conflict.
Delete Gulasch

I´m gonna Delete the files in my branch that differ from the master branch in order to solve the merge conflict.
Delete Pfannkuchen

I´m gonna Delete the files in my branch that differ from the master branch in order to solve the merge conflict.
Delete Tomatensuppe

I´m gonna Delete the files in my branch that differ from the master branch in order to solve the merge conflict.
Merge pull request #3 from animalena/annasBranch

Annas branch