yi
a
aaa
aa
moumoua   zuihou
add the class btn moumoua
yi
a
fenzhi
Merge branch 'master' of
https://github.com/zhangbiao7526/togoandroidDemo.git

Conflicts:
	togoandroidDemo/AndroidManifest.xml
	togoandroidDemo/bin/AndroidManifest.xml
	togoandroidDemo/bin/R.txt
	togoandroidDemo/bin/classes.dex
	togoandroidDemo/bin/classes/android/support/v7/appcompat/R$layout.class
	togoandroidDemo/bin/classes/com/example/togodemo/HomeFragment$2.class
	togoandroidDemo/bin/classes/com/example/togodemo/HomeFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/MainActivity.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$drawable.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$id.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$integer.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$layout.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$menu.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$string.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$style.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$styleable.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment$NewAdapter.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/classifyLayout/ClassifyFragment_right1.class
	togoandroidDemo/bin/classes/com/example/togodemo/classifyLayout/ClassifyFragment_right2.class
	togoandroidDemo/bin/classes/com/example/togodemo/classifyLayout/ClassifyFragment_right3.class
	togoandroidDemo/bin/classes/com/example/togodemo/classifyLayout/ClassifyFragment_right4.class
	togoandroidDemo/bin/classes/com/example/togodemo/classifyLayout/ClassifyFragment_right5.class
	togoandroidDemo/bin/classes/com/example/togodemo/home/HomeF_vpage_click.class
	togoandroidDemo/bin/classes/com/example/togodemo/home/OneSop_click.class
	togoandroidDemo/bin/classes/com/example/togodemo/myApplication.class
	togoandroidDemo/bin/classes/com/example/togodemo/ui/abstOnTouchListener.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister$2.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/User_Login.class
	togoandroidDemo/bin/classes/com/example/togodemo/variable/VARIABLE.class
	togoandroidDemo/bin/dexedLibs/android-support-v7-appcompat-88e9971ae33eb64b43c3c13d07ba7e08.jar
	togoandroidDemo/bin/resources.ap_
	togoandroidDemo/bin/togoandroidDemo.apk
	togoandroidDemo/gen/android/support/v7/appcompat/R.java
	togoandroidDemo/gen/com/example/togodemo/R.java
	togoandroidDemo/src/com/example/togodemo/myApplication.java
ca
haole
haode