Checkin
Merge branch 'master' of https://github.com/abhishek0909/nhs

Conflicts:
	src/main/java/com/nhs/service/DoctorService.java