working on edit shifts
working
oh yea
edited comments
Merge branch 'master' of https://github.com/z-neil/Ecse-428