Kacper file
Kacper2 new file
Updated Kacper.txt
New content in Kacper2.txt
Merge branch 'new_branch'
Changed file Kacper2.txt
Changed file Kacper2
Merge branch 'new_branch'

Conflicts:
	kacper2.txt
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from Kacper3331/master

First pull request from Kacper