Sixth file
Merge branch 'feature/sixth-file' of https://github.com/okovelkov/testone into develop
Bugfix
Merge branch 'release/six-files'