added a file to master
Merge branch 'master' into feature2

Merging changes from master into feature2