Merge pull request #21 from mdt0093/wait-staff

I merged the wait staff into master, and then updated that branch with the latest information from master.
Merge pull request #22 from mdt0093/master

Merge pull request #21 from mdt0093/wait-staff