Merge branch 'master' into staging
Adding UI Library
Merge pull request #3 from blainefricks/staging

Staging