Part of new Functionality

start of new func...
New Functionality

full new functionality
Merge branch 'newFunc'

Conflicts:
	test.cpp