added 3 b files
added 3 d files
Merge branch 'dev'