old 3 :)
33
new before merge 33
Merge branch 'Marek123' of github.com:pietkiem/test into Marek123

Conflicts:
	just a test.txt