changed text
Merge branch 'master' of github.com:pawelsawicz/jgtest
changed text
merge conflict resolved acutler.txt