Update file
Update file
Update file
Update files
Merge branch 'master' of https://github.com/String1415BIM/TP_String_1415

Conflicts:
	String.cpp
	String.h
	test_main.cpp