new feature documentation
Merge pull request #1 from jwmarshall/feature/newfeature

new feature
Merge pull request #2 from jwmarshall/develop

great feature
new file