dyw622-c-first
Merge branch 'master' of
https://github.com/HazelChen/educationalSystem.git

Conflicts:
	EMSystemClientC/bin/.gitignore