Whateva, whateva, I do what I want!
Merged Khaled and Mason

Conflicts:
	testFolder/test.cpp