提交本地文件
Merge branch 'master' of https://github.com/renjie120/android_money

Conflicts:
	.gitignore
	bin/classes.dex
	bin/money.apk