Few changes to String.h. Must be commited to pull
fusion in.h
+ string implemented, not tested yet. Commit needed to pull.
Marianne's changes added

Conflicts:
	String.h
Merge branch 'master' of https://github.com/String1415BIM/TP_String_1415

Conflicts:
	String.h