change fileone.txt prtest
solve fileone.txt merge conflict
Merge pull request #3 from skaplanhex/prtest

change fileone.txt prtest