Sync test 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