File added in my dev branch.
Added an other file to the branch.
Added an new file to the master branch.
Merge branch 'dev_#23'