modified by yejiaGH ProA_03
change by yejiaalice proA/ProA_03
Merge branch 'develop' of https://github.com/yejiaGH/GitTry_01 into develop

Conflicts:
	proA/ProA_03.txt.rtf
yejiaalice change it again
new line
Solve the confilit
try it again to see what cause conflict
Merge branch 'develop' of https://github.com/yejiaGH/GitTry_01 into develop

Conflicts:
	proA/ProA_03.txt.rtf
Solve the conflict again
update ProA_02
yejiaalice change the ProA_02
New ProA_011 and Modify ProA_02
Merge branch 'develop' of https://github.com/yejiaGH/GitTry_01 into develop

Conflicts:
	proA/ProA_02.txt