merge
Merge branch 'master' of https://github.com/Win14Crone/PTAChessProject

Conflicts:
	PTAChessProjectCode/PTAChessProjectCode.v12.suo
	PTAChessProjectCode/PTAChessProjectCode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PTAChessProjectCode/PTAChessProjectCode/obj/Debug/PTAChessProjectCode.csproj.FileListAbsolute.txt