.
Merge branch 'master' of
https://github.com/HazelChen/educationalSystem.git

Conflicts:
	Project_C/src/emsystemimp/AdminServiceImp.java