พัง
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/th/ac/kmitl/it/faceinfo/main/Data.java