CR fixes
CR Fixes
Merge pull request #14 from vinsol/staff-login

Staff login
Merge branch sprint-3 into staff-appointments and fix conflicts.