no message
Merge branch 'master' of https://github.com/jungfengpaulwang/EMBATeachingEvaluation

Conflicts:
	TeachingEvaluation.csproj.user
	obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/x86/Debug/TeachingEvaluation.csproj.GenerateResource.Cache
	obj/x86/Debug/TeachingEvaluation.csprojResolveAssemblyReference.cache
	obj/x86/Debug/TeachingEvaluation.dll
	obj/x86/Debug/TeachingEvaluation.pdb
	obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll