Delete Gulasch

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