solving conflicts
Merge branch 'master' of github.com:propra13-orga/gruppe13
refixing conflicts, i did some stupid stuff