add a cpp file
add function add
nothing to say
Merge branch 'test'

Conflicts:
	test.cpp

	all commit