Sync test 2
Test change 2
Merge branch 'Dev' of https://github.com/aonanam/EC-327-Face-Off into Dev

Conflicts:
	FaceOff/bin/classes/com/example/faceoff/BaseFace$1.class
	FaceOff/bin/classes/com/example/faceoff/BaseFace.class
Sync test
Test change 3
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/src/com/example/faceoff/BaseFace.java
sfasdf
Text field and create profile options

Added text field to create profile, removed basefacetutorial (not the
tutorial on the main menu), added options to create another profile
directly after making one or to return to the main menu afterword. Still
working on drop down menus
Drop down menus

Added drop down menu (spinner) for profile selection to the player 1 and
2 screens. Both access string array in strings.xml in the values folder.
So the next step is to make an array of all the profile names that were
entered and have that be the array the spinner uses. Kind of minor right
now but we should also figure out how to not show the profile that was
selected for player 1 when player 2 chooses their profile. Also removed
action bar since I don't see why we need it. Could always put it back
later though.
QA
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/resources.ap_
Profiles get created!

Updated so profiles get added to ProfileCreationLogic.Profiles after a
name is entered and they hit "Create Base Face"
Some annoying eclipse stuff
Syncing stuff?