test6.cpp commit
Merge branch 'develop'