conflict test 2
resolve conflict
Merge pull request #4 from pdgarvey/branch1

conflict test 2