Update to Draft.md in Features and Design sections.
fixed merge conflicts
Merge branch 'bryanconnor-patch-1' fixes #1