new login
Merge branch 'master' of https://github.com/mukundc/Gather

Conflicts:
	bin/Gather.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$attr.class
	bin/classes/android/support/v7/appcompat/R$bool.class
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$dimen.class
	bin/classes/android/support/v7/appcompat/R$id.class
	bin/classes/android/support/v7/appcompat/R$integer.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/android/support/v7/appcompat/R$string.class
	bin/classes/android/support/v7/appcompat/R$style.class
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/com/example/gather/CreateGathering$1$1.class
	bin/classes/com/example/gather/CreateGathering$1.class
	bin/classes/com/example/gather/CreateGathering.class
	bin/classes/com/example/gather/MainActivity$1.class
	bin/classes/com/example/gather/MainActivity$2$1.class
	bin/classes/com/example/gather/MainActivity$2$2.class
	bin/classes/com/example/gather/MainActivity$2.class
	bin/classes/com/example/gather/MainActivity$3.class
	bin/classes/com/example/gather/MainActivity.class
	bin/classes/com/example/gather/R$attr.class
	bin/classes/com/example/gather/R$bool.class
	bin/classes/com/example/gather/R$color.class
	bin/classes/com/example/gather/R$dimen.class
	bin/classes/com/example/gather/R$drawable.class
	bin/classes/com/example/gather/R$id.class
	bin/classes/com/example/gather/R$integer.class
	bin/classes/com/example/gather/R$layout.class
	bin/classes/com/example/gather/R$menu.class
	bin/classes/com/example/gather/R$string.class
	bin/classes/com/example/gather/R$style.class
	bin/classes/com/example/gather/R$styleable.class
	bin/classes/com/facebook/android/R$attr.class
	bin/classes/com/facebook/android/R$color.class
	bin/classes/com/facebook/android/R$dimen.class
	bin/classes/com/facebook/android/R$drawable.class
	bin/classes/com/facebook/android/R$id.class
	bin/classes/com/facebook/android/R$layout.class
	bin/classes/com/facebook/android/R$string.class
	bin/classes/com/facebook/android/R$style.class
	bin/classes/com/facebook/android/R$styleable.class
	bin/dexedLibs/Parse-1.5.1-39664fc8daf8b8c3f6b69dee8a243606.jar
	bin/dexedLibs/android-support-v4-851ad6ecef60df6b9bb51c922a18409a.jar

bin/dexedLibs/android-support-v7-appcompat-5e8d1bb177fa545261d7a423b79f3
4ba.jar

bin/dexedLibs/android-support-v7-appcompat-e2d094bc5babac91b869caea754ba
34d.jar
	bin/dexedLibs/bolts-eda6fc1781bde18f90a6b0a821a957e1.jar
	bin/dexedLibs/facebooksdk-1df15ba9be7d43c4a6ef00b49ff39bd1.jar
	bin/jarlist.cache
	bin/resources.ap_
	gen/com/example/gather/R.java
	gen/com/facebook/android/R.java
	project.properties
	res/layout/activity_create_gathering.xml
	res/layout/activity_main.xml
	src/com/example/gather/CreateGathering.java
	src/com/example/gather/MainActivity.java