commit right before pull request
another commit to dev
another to dev
Merge pull request #1 from n8ebel/dev

Pulling dev branch into master