Syncing test
Merge branch 'master' of https://github.com/aonanam/EC-327-Face-Off

Conflicts:
	FaceOff/bin/classes/com/example/faceoff/BaseFace$1.class
	FaceOff/bin/classes/com/example/faceoff/BaseFace.class
	FaceOff/src/com/example/faceoff/BaseFace.java