Finished up API methods for doctors/nurses
Fixing conflicts