modify ProA_04 from branch local
Merge branch 'local' into develop

Conflicts:
	proA/ProA_04.txt