added newfile
testing branch commit
iss53 commit 1
master commit
Merge branch 'iss53'
iss54 commit
master commit after iss54 commit
Merge branch 'iss54'

Conflicts:
	ourfile.txt
Merge pull request #3 from cahartin/master

Merge pull request #1 from bpbond/master
Merge pull request #2 from bpbond/master

test again