bringing in latest codebase
dumped in all the content from comp
Merge branch 'gh-pages' of https://github.com/dezzie/design-manual into gh-pages
revised sentence on homepage
Merge pull request #136 from stephanieosan/gh-pages

Revised sentence on homepage
added a hyphen on homepage
dropping content into Pagination page of UI Toolkit
Merge pull request #140 from stephanieosan/gh-pages

Pagination content in!
Merge pull request #129 from dezzie/gh-pages

Added content from comp to links page in UI toolkit
resolving conflict