operator=(char) & operator+(char*)
Merge branch 'master' of https://github.com/egarnier/TP_String

Conflicts:
	String.cpp
	String.h