dupakonflikt
Merge remote-tracking branch 'remotetest/test2'

Conflicts:
	testowy.js