bingo test
Merge branch 'master' of https://github.com/kmarshj/jingli

Conflicts:
	src/com/zdht/jingli/MainActivity.java

kkk
我合并测试一下,提交