Add operator+(char*) (student 2)
Merge branch 'master' of https://github.com/oliviaAB/tpstring

Conflicts:
	Teststring.cpp
	string.h