join comp
Merge branch 'JangHyeon' into jungeun

Conflicts:
	HACO_System/.classpath