fixing master
Merge branch 'master' of github.com:Ivan8888/shiftplanning