Removed crufts from merge conflict, see 0e5be41
Merge branch 'master' of github.com:ocean90/wpf-stundenplan