added a new feature file
new feature has been added
added some stuff
Merge branch 'new-feature'
test
Merge branch 'new-feature'