first branch commit
Merge branch 'fitstbranch'

Conflicts:
	src/test.cpp

Signed-off-by: AlexP <podgorny@inbox.ru>