adding a testfile
simple change
change to the master branch
resolved conflicts by merging
Merge branch 'master' of https://github.com/philburtaj/test_repo
I am checking my changes in...