Merge branch 'master' into John
Can no longer switch/swap shifts in the past!
Merge pull request #4 from ksolkowski/John

John