ok
zxing
Merge branch 'master' of https://github.com/65352438/MyCodes

Conflicts:
	设计文档.doc