Merge pull request #1 from cahartin/master

Update ourfile.txt
hi
fixed conflict
Merge branch 'cahartin-master' to fix conflict
Merge pull request #1 from bpbond/master

updates