copy the new main.cpp to the current directory.
Merge branch 'master' into tstbrch

Conflicts:
	main.cpp
modification in tst2 branch
Merge remote-tracking branch 'upstream/master'