Merge branch 'refs/heads/editable'
testing commit
Philipp testing commit
test commit
Test Commit
Merge branch 'master' of https://github.com/joseipong/DoctorsDashboard into editable

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/PatientActivity.java
	readme.txt
Merge branch 'master' of https://github.com/jeladante/DoctorsDashboard into editable

Conflicts:
	readme.txt
Testing ni Yu
Test Commit ni Yu
Merge branch 'master' of https://github.com/jayu94/DoctorsDashboard into editable

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/ckmbasa/DoctorsDashboard into editable

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/yopilip123/DoctorsDashboard into editable
Merge Philipp
Doctor's notes
Merge branch 'master' of https://github.com/jeladante/DoctorsDashboard into editable

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/PatientEncounterActivity.java
	MainActivity/src/com/example/database/DatabaseAdapter.java
	MainActivity/src/com/example/model/Soap.java
Merge branch 'refs/heads/master' into editable
Merge branch 'master' of https://github.com/alvinjay/DoctorsDashboard into editable

Conflicts:
	MainActivity/src/com/example/android/navigationdrawerexample/PatientActivity.java
	readme.txt