update
branch testing 01
master modify
hotfix 01
Merge branch 'testing'
use all.

Conflicts:
	test.cpp