boooo
Merge branch 'master' of https://github.com/stu515/his-payroll
bvbvbvbvbv
Conflicts:
	PredatorUI2/PredatorUI2.csproj
	PredatorUI2/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PredatorUI2/obj/x86/Debug/PredatorUI2.csproj.FileListAbsolute.txt
with design21