something
merge fix
Merge branch 'master' of https://github.com/asharma93/hackathon-app

Conflicts:
	MedManagerUI/app/src/main/res/layout/fragment_doctor_main_view.xml