Amended file2
Amended file3
Merge branch 'feature/new_and_improved' into develop