changed by yejiaalice
Merge branch 'develop' of https://github.com/yejiaGH/GitTry_01 into develop

Conflicts:
	proA/ProA_02.txt
Solve the conflitcs in ProA_02.txt