edit masterfeature2.txt
Merge branch 'master' into feature