c1
c2
c3
Merge branch 'foo'
haaalo
bey bey
Merge branch 'foo'

Conflicts:
	galezie3.txt
lab4

lab 4