add 3 b files
merging
Merge branch 'dev'