test
master change
Merge branch 'TEST'

Conflicts:
	nowy.cpp