Added to master
New file for new feature
Merge branch 'feature1'