add file
modif file
Merge branch 'bugfix'

merge file2 from branch master and file from branch bugfix