Fixed bug where making a shift and then deleting the volunteer caused an error
Merge branches 'master' and 'And_I_said'
Merge branch 'master' of https://github.com/dlmather/cs169-mainproject