new b files
added d files
Merge branch 'dev'
This is a merge.