hours_shift explored
Merge branch 'master' of https://github.com/dudubird1207/ADSFinal