Merge pull request #1 from Gregs1905/dev

added note-1
committed from d1
committed from d2
Merge pull request #2 from Gregs1905/d1

committed from d1
Merge branch 'd2'
resolving conflicts