Fixing Fonts
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$1.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2$2.class
	FaceOff/bin/classes/com/example/faceoff/FaceCompare2$processData.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.class
	FaceOff/bin/classes/com/example/faceoff/Player1Offense.class
	FaceOff/bin/classes/com/example/faceoff/R$id.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/dexedLibs/android-support-v4-0682c8c88c87ea0396bc24d290d7d9ad.jar

	FaceOff/bin/dexedLibs/android-support-v4-5505c79dae8269d68d679a161ddf4f85.jar

	FaceOff/bin/dexedLibs/unirest-java-1.3.2-SNAPSHOT-withDependency-ShadedForAndroid-66d7a63c188a5be49ae2458882503e71.jar

	FaceOff/bin/dexedLibs/unirest-java-1.3.2-SNAPSHOT-withDependency-ShadedForAndroid-77609d382f494fdcce1da7d6feb945a7.jar
	FaceOff/bin/resources.ap_
	FaceOff/gen/com/example/faceoff/R.java
	FaceOff/res/layout/activity_face_compare.xml
	FaceOff/src/com/example/faceoff/MainActivity.java
	FaceOff/src/com/example/faceoff/Player1Offense.java