Merge branch 'master' into John
Merge branch 'master' into John
w/e finished working on the
got decently far on the shift switching

also some other things to clean stuff up!
Merge branch 'master' into John
just some things for shift-switch

emails? and loading/validating it
made a list of users, colors, and roles on page, need to add events to calendar now based on selection
getting there
Merge branch 'master' into John
Merge branch 'master' into kevin
Merge branch 'John' into kevin
getting things good before monday….
get the seed file looking good (hopefully)
lets go with this?
Merge branch 'kevin'