fix
Merge branch 'dev' of https://github.com/artop57/DoctorTask into dev
front end fix
Add contributor
Merge branch 'dev' of https://github.com/artop57/DoctorTask into dev
merge conflicts
Merge branch 'dev' of https://github.com/artop57/DoctorTask into dev
merge conflicts