Adding a file directly to master to show rebase.
Added a new file to the newfeature branch.
Adding a second file on the newfeature branch to show rebasing.
Merge branch 'newfeature' of github.com:geocent-yancy/test into newfeature