stuff
first hunk
rest
stuff
first hunk
rest
Merge branch 'master' of github.com:bhenry/rebase into feature5
added text
added text
Fix bug with Merge branch 'feature5'

all commits.
Update d.txt

updated d.txt
stuff
first hunk
rest
updated g
fix readme
fix R
EADME