Modif
Modif

Merge branch 'master' of https://github.com/egarnier/TP_String

Conflicts:
	prog_main.cpp