made a change to the readme on the newbranch
another update to the readme
yet another line in the readme
fixed conflicts merging newbranch with master