测试上传
Merge branch 'master' of https://github.com/81813780/Hospital.git
gjhgjhkjk
修改后1311
hjh
Merge remote-tracking branch 'llloy/master'
第一次合并
Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/fragment/DoctorAdviceFragment.java