this_test.cpp modified in master branch
Merge branch 'experiment_on_home_compueter'

Conflicts:
	this_test.cpp

handle the conflicts for the file this_test.cpp
merge test 3