committing for pull
fixed conflicts
added methods for doctors queries from part (2)
fixing conflicts