new file 2

new file 2
Merge branch 'feature/ticket2' into dev