Trying to add popup functionality
Trying to fix PickCharacterActiviy.java
Making changes from code review
Merge branch 'master' of https://github.com/ashleyjihye4/Diversity into ashleyjihye4-master

Conflicts:
	ParseStarterProject/AndroidManifest.xml
	ParseStarterProject/bin/AndroidManifest.xml
	ParseStarterProject/bin/ParseStarterProject.apk
	ParseStarterProject/bin/classes.dex
	ParseStarterProject/bin/classes/com/parse/starter/Character.class
	ParseStarterProject/bin/classes/com/parse/starter/GPSActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/InventoryActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/Item.class
	ParseStarterProject/bin/classes/com/parse/starter/Level.class
	ParseStarterProject/bin/classes/com/parse/starter/LoginActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/LoginActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity$2.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity$3.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity$4.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity$5.class
	ParseStarterProject/bin/classes/com/parse/starter/MainMenuActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/ParseApplication.class
	ParseStarterProject/bin/classes/com/parse/starter/PersistToCloudActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/PhotosActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/PhotosActivity$2.class
	ParseStarterProject/bin/classes/com/parse/starter/PhotosActivity$3.class
	ParseStarterProject/bin/classes/com/parse/starter/PhotosActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/Puzzle.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$2.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$3.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$4.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$5.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$6.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$7.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity$8.class
	ParseStarterProject/bin/classes/com/parse/starter/PuzzleActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/R$attr.class
	ParseStarterProject/bin/classes/com/parse/starter/R$dimen.class
	ParseStarterProject/bin/classes/com/parse/starter/R$drawable.class
	ParseStarterProject/bin/classes/com/parse/starter/R$id.class
	ParseStarterProject/bin/classes/com/parse/starter/R$layout.class
	ParseStarterProject/bin/classes/com/parse/starter/R$string.class
	ParseStarterProject/bin/classes/com/parse/starter/R$style.class
	ParseStarterProject/bin/classes/com/parse/starter/R.class
	ParseStarterProject/bin/classes/com/parse/starter/SignUpActivity$1$1.class
	ParseStarterProject/bin/classes/com/parse/starter/SignUpActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/SignUpActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/SignUpOrLogInActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/TrophiesActivity$1.class
	ParseStarterProject/bin/classes/com/parse/starter/TrophiesActivity$2.class
	ParseStarterProject/bin/classes/com/parse/starter/TrophiesActivity$3.class
	ParseStarterProject/bin/classes/com/parse/starter/TrophiesActivity.class
	ParseStarterProject/bin/classes/com/parse/starter/User.class
	ParseStarterProject/bin/dexedLibs/Parse-1.4.3-0c478383f441e5eca4b2a2cc099bbb07.jar
	ParseStarterProject/bin/resources.ap_
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/res/values/strings.xml
	ParseStarterProject/src/com/parse/starter/SignUpActivity.java
	ParseStarterProject/src/com/parse/starter/User.java
Merge branch 'ashleyjihye4-master'