Dialog Box

Added a dialog box on the main screen for when the user clicks to start
the game but they haven't created profiles yet
Create Profile update 2
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/FaceCompare.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Offense.class
	FaceOff/bin/classes/com/example/faceoff/R$id.class
	FaceOff/bin/classes/com/example/faceoff/R$layout.class
	FaceOff/bin/classes/com/example/faceoff/R$menu.class
	FaceOff/bin/classes/com/example/faceoff/R$string.class
	FaceOff/bin/classes/com/example/faceoff/R$style.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone.class
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/res/layout/activity_player2_defense.xml
	FaceOff/src/com/example/faceoff/Player1Defense.java
	FaceOff/src/com/example/faceoff/Player2Defense.java
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/FaceCompare.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity$1.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity$2.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity$3.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Offense.class
	FaceOff/bin/classes/com/example/faceoff/R$drawable.class
	FaceOff/bin/classes/com/example/faceoff/R$id.class
	FaceOff/bin/classes/com/example/faceoff/R$layout.class
	FaceOff/bin/classes/com/example/faceoff/R$menu.class
	FaceOff/bin/classes/com/example/faceoff/R$string.class
	FaceOff/bin/classes/com/example/faceoff/R$style.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone.class
	FaceOff/bin/classes/com/example/faceoff/StartFaceOff.class
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/res/layout/activity_player1_defense.xml
	FaceOff/src/com/example/faceoff/MainActivity.java
	FaceOff/src/com/example/faceoff/Player1Defense.java
	FaceOff/src/com/example/faceoff/Player2Defense.java
Merge branch 'Dev' of https://github.com/aonanam/EC-327-Face-Off into Dev

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/MainActivity.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/resources.ap_
	FaceOff/src/com/example/faceoff/Player1Defense.java
Profile selection screen update
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/resources.ap_
	FaceOff/src/com/example/faceoff/Player1Defense.java
Still looking at math errors
Merge remote-tracking branch 'origin/Dev' into Dev

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

Conflicts:
	FaceOff/AndroidManifest.xml
	FaceOff/bin/AndroidManifest.xml
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/FaceCompare.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/classes/com/example/faceoff/R$id.class
	FaceOff/bin/classes/com/example/faceoff/R$layout.class
	FaceOff/bin/classes/com/example/faceoff/R$menu.class
	FaceOff/bin/classes/com/example/faceoff/R$string.class
	FaceOff/bin/classes/com/example/faceoff/R$style.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone.class
	FaceOff/bin/classes/com/example/faceoff/StartFaceOff.class
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/src/com/example/faceoff/Player1Defense.java
	FaceOff/src/com/example/faceoff/Player2Defense.java
Merge
Added player two to the selection
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/classes.dex
	FaceOff/bin/classes/com/example/faceoff/FaceCompare.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity$2.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity$3.class
	FaceOff/bin/classes/com/example/faceoff/MainActivity.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Defense.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense$1.class
	FaceOff/bin/classes/com/example/faceoff/Player2Defense.class
	FaceOff/bin/classes/com/example/faceoff/R$id.class
	FaceOff/bin/classes/com/example/faceoff/R$layout.class
	FaceOff/bin/classes/com/example/faceoff/R$menu.class
	FaceOff/bin/classes/com/example/faceoff/R$string.class
	FaceOff/bin/classes/com/example/faceoff/R$style.class
	FaceOff/bin/classes/com/example/faceoff/SinglePhone.class
	FaceOff/bin/classes/com/example/faceoff/StartFaceOff.class
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/src/com/example/faceoff/MainActivity.java
	FaceOff/src/com/example/faceoff/Player1Defense.java
merge again
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/resources.ap_
FIXED
Merge remote-tracking branch 'origin/Dev' into Dev

Conflicts:
	FaceOff/bin/FaceOff.apk
	FaceOff/bin/resources.ap_
Merge
Working for GUI purposes, pings disabled.