Names of variables and methods changed following the specs
New constructor added. Variables' names changed following the spec

Conflicts:
	String.cpp