Add file 6
Merge branch 'feature-two'

* feature-two:
  Add file 6