Merge pull request #1 from magwalk/Maggie-Branch1

Add Color Variables
Fix Margin in Mobile Layout
Merge pull request #2 from magwalk/Maggie-Branch1

Maggie branch1
Fix Merge Conflicts
Fix Merge Conflicts