bad2
Merge branch 'master' of https://github.com/wty1990000/TY_repository

Conflicts:
	Projects/CUDA_GPU/GPU_DIC/Images/Results_data.txt
	Projects/CUDA_GPU/GPU_DIC/Images/Results_info.txt