test
Merge branch 'master' of https://github.com/todn211/discount_IntelliJ_IDEA

Conflicts:
	discount/src/com/zixingchen/discount/activity/MainActivity.java