Allen changed
Allen
Merge branch 'devBranch' of https://github.com/g8231226702/mobile_final into devBranch

Conflicts:
	solutions-mobile-backend-starter-android-client-master/bin/R.txt
	solutions-mobile-backend-starter-android-client-master/bin/classes.dex

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$layout.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$menu.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$string.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$style.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/R$styleable.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/sample/guestbook/PostAdapter.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/sample/guestbook/SecondActivity$2.class

solutions-mobile-backend-starter-android-client-master/bin/classes/com/g
oogle/cloud/backend/sample/guestbook/SecondActivity.class

solutions-mobile-backend-starter-android-client-master/bin/classes/mobil
e_final/VoteHandler.class

solutions-mobile-backend-starter-android-client-master/bin/resources.ap_

solutions-mobile-backend-starter-android-client-master/gen/com/google/cl
oud/backend/R.java
Allen