first commit to newfeature branch
second set of changes
Merge pull request #1 from shannonwells/feature/newfeature

first commit to newfeature branch