update -- zhangshtuong
update
zzzzz
===
add l line  before  bijiben
add pc
delete all

Signed-off-by: zst <zs_t@sina.cn>
Merge branch 'master' of https://github.com/HelloWordforzst/newabc

Conflicts:
	NewVision/bin/NewVision.apk
	NewVision/bin/classes.dex
	NewVision/bin/classes/njnu/det/newvision/NV_Host.class
	NewVision/bin/resources.ap_
	NewVision/src/njnu/det/newvision/NV_Host.java
	NewVision/src/njnu/det/newvision/User.java
delete all

Signed-off-by: zst <zs_t@sina.cn>