Merge branch 'develop' of github.com:datt/doc_finder into develop
resolved conflicts
resolved conflicts
Merge branch 'develop' of github.com:datt/doc_finder into develop
Merge branch 'develop' of github.com:datt/doc_finder into develop
Merge branch 'develop' of github.com:datt/doc_finder into develop
working on admin site for doctor
resolved conflicts