d
Merge branch 'zosia' into dawid

Conflicts:
	New Text Document.txt
Merge branch 'dawid' into Elizon