oxo dodaje koze
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testy.txt
Merge pull request #2 from oxo2607/master

integracja kozy