some text.txt added
Merge branch 'feature1' into feature/addition

* feature1:
  some text.txt added