合并前
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/81813780/Hospital.git

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
版本一
检查检验修改
Merge remote-tracking branch 'llloy/master'

Conflicts:
	bin/Hospital.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/android/hospital/ui/activity/MainActivity.java

Signed-off-by: SeaDragon King <81813780@qq.com>