已修改MainActivity
Merge branch 'master' of https://github.com/wuluoteam/Demo

Conflicts:
	bin/classes.dex
	bin/classes/com/project/savemoney/MainActivity.class
	bin/classes/com/project/savemoney/R$id.class
	bin/classes/com/project/savemoney/R$layout.class
	bin/classes/com/project/savemoney/R$menu.class
	bin/classes/com/project/savemoney/R$string.class
	bin/classes/com/project/savemoney/R$style.class
	bin/resources.ap_
	bin/鐪侀挶杈句汉.apk
	src/com/project/savemoney/MainActivity.java