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

Conflicts:
	EMSystemClientA/src/emsystem/data/Course.java