menu sorting
sort menu added
Yo
Merge branch 'Ahmed'

Conflicts:
	Troll/bin/Troll.apk
	Troll/bin/classes.dex

Troll/bin/dexedLibs/android-support-v7-appcompat-fc214a640bb79a12095a41e
bd9171942.jar

Troll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302
603b6.jar
	Troll/bin/resources.ap_
Finished integrating Alex & John PW retrieval
Merge branch 'Ahmed'

Conflicts:
	Troll/bin/Troll.apk
	Troll/bin/classes.dex

Troll/bin/dexedLibs/android-support-v7-appcompat-fc214a640bb79a12095a41e
bd9171942.jar

Troll/bin/dexedLibs/google-play-services_lib-e5eb1253bb1207a030aeb31f302
603b6.jar
	Troll/bin/resources.ap_
Merge branch 'Joel'

Conflicts:
	Troll/AndroidManifest.xml
	Troll/bin/AndroidManifest.xml
	Troll/bin/R.txt
	Troll/bin/Troll.apk
	Troll/bin/classes.dex
	Troll/bin/classes/android/support/v7/appcompat/R$layout.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity$GetMenu.class
	Troll/bin/classes/edu/ucsd/troll/app/LocationMenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/MenuActivity$1.class
	Troll/bin/classes/edu/ucsd/troll/app/MenuActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/ProfileActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/R$id.class
	Troll/bin/classes/edu/ucsd/troll/app/R$integer.class
	Troll/bin/classes/edu/ucsd/troll/app/R$layout.class
	Troll/bin/classes/edu/ucsd/troll/app/R$menu.class
	Troll/bin/classes/edu/ucsd/troll/app/R$string.class
	Troll/bin/classes/edu/ucsd/troll/app/R$style.class
	Troll/bin/classes/edu/ucsd/troll/app/R$styleable.class
	Troll/bin/classes/edu/ucsd/troll/app/SignUpActivity.class
	Troll/bin/classes/edu/ucsd/troll/app/SingleMenuItemActivity.class
	Troll/bin/resources.ap_
	Troll/gen/edu/ucsd/troll/app/R.java
Merge branch 'master' into Ahmed