More profile creation testing
Drop

Drop down menu when choosing profile now works with the names the user
entered in the create profile page. Also changed one button to an
imagebutton. To change the others just go to the xml of the activity
with the button you want to change, then switch <Button to <ImageButton,
add a thing that says android:src="@drawable/image" below it with image
being the name of your picture. Put your icon pictures in the
drawable-xxhdpi folder which is under res. Then in the java class for
each activity change Button to ImageButton near the top and below under
where I wrote //Locate buttons in activity_main.xml or whatever xml you
edited
Dev
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/BaseFace.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile$1.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile.class
	FaceOff/bin/resources.ap_
	FaceOff/src/com/example/faceoff/CreateProfile.java
Merge branch 'Dev' of https://github.com/aonanam/EC-327-Face-Off into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/CreateProfile$1.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile.class
	FaceOff/src/com/example/faceoff/CreateProfile.java
Profile creation w/ picture

Uri with no path errors occaisionally
Get selected name from drop down menu

Adds it to active_Players array
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/CreateProfile$1.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile.class
	FaceOff/src/com/example/faceoff/CreateProfile.java
Sync
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/classes/com/example/faceoff/CreateProfile$1.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile.class
Error checking onActivityResult
Syncing
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/CreateProfile$1.class
	FaceOff/bin/classes/com/example/faceoff/CreateProfile.class
	FaceOff/src/com/example/faceoff/CreateProfile.java
Dialog Box

Added dialog box for quick tutorial before taking base face
Syncing stuff, camera issues presist
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
Display image in player2defense

still need to implement camera in player1 offense which then takes a
picture. then the name of that picture needs to go in place of test.jpg
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
Syncing
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/resources.ap_