Merge before merging with master
Merge branch 'master' of github.com:dlmather/cs169-mainproject
85% Coverage for CRUD Operations for Events and Shifts
Merge branch 'master' of github.com:dlmather/cs169-mainproject
Merged with master 11/11/13 but have to sign up to add shifts