add line in experiment branch
Merge branch 'experiment_on_home_compueter'

Conflicts:
	this_test.cpp

handle the conflicts for the file this_test.cpp
merge test 3
Merge branch 'master' of github.com:wintel2014/Test

Conflicts:
	this_test.cpp

Manual modification 2014-0728