HEEEYYEAHAYEYEEAHHHEEEYYEEEYAH
Merge pull request #45 from dlmather/feature/moreRotationTweaks2

HEEEYYEAHAYEYEEAHHHEEEYYEEEYAH
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
woof woof bark bark
Merge pull request #46 from dlmather/feature/trolololo

woof woof bark bark
Added some styling to the emails sent
Merge branches 'master' and 'ModifiedEmail'
Merge branch 'master' of https://github.com/dlmather/cs169-mainproject
Merge branch 'master' of github.com:dlmather/cs169-mainproject into email_testing