[master] added another dummy file
Merge branch 'master' into testrossome
[testrossome] added conflict