Commented out a bug in the updateShiftTimes method for now.
Merge branch 'master' of https://github.com/nachosgrande/System-Prototype