"Please commit and then sync", Git says.
Merge branch 'master' of https://github.com/leeyimin/CsProject

Conflicts:
	JDAS/src/ViewRIERecords.form
	JDAS/src/ViewRIERecords.java