Delete Edit wish hinzugefügt
Merge branch 'master' of github.com:Tranquility/studentsonrails-weihnachtsmann