Added fisier 2
Commit 4
Commit on testing branch
Another commit on testing branch
Another commit on master
Yet another commit on master
Added a fix
Merge branch 'testing'