another DMS_application.class --- git conflict
sdfg
sdf
Merge branch 'master' of https://github.com/Daocheng/DMS_isep.git

Conflicts:
	src/com/dms_isep/DMS_isepApplication.java