Add the getter c_str. Add function resize without the parameter reserve.
Conflict resolved. Merge branch 'master' of https://github.com/mmuntaner/TP_String

Conflicts:
	String.h