line 45 changed
Merged Khaled and Mason

Conflicts:
	testFolder/test.cpp