costam
costam2
Merge branch 'task2'

Conflicts:
	plik1.txt
change master
master