Philipp Added Comment XML
- nagcomment ko guysgdsjfsdsth
Merge branch 'master' of https://github.com/yopilip123/DoctorsDashboard
This is my comment -Yu-
Merge branch 'master' of https://github.com/jayu94/DoctorsDashboard
Merge https://github.com/alvinjay/DoctorsDashboard
test
Merge branch 'master' of https://github.com/ckmbasa/DoctorsDashboard
Added activity_patient, activity_patient_encouter, activity_patient_info
Merge branch 'master' of https://github.com/yopilip123/DoctorsDashboard

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/MainActivity.java
conflict resolution
Merge pull request #2 from joseipong/master

merge tanan
Merge branch 'master' of https://github.com/alvinjay/DoctorsDashboard

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/MainActivity.java
Merge branch 'master' of https://github.com/alvinjay/DoctorsDashboard

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/MainActivity.java.orig