resolves #326
Merge branch 'master' of https://github.com/YaleSTC/shifts