updating first line to make a conflict
Merge pull request #3 from eccarmichael/feature2

updating first line to make a conflict