function2
add string
Merge branch 'function2'

Conflicts:
	testing.cpp