Merge pull request #76 from StanfordHCI/jf-recolor

Updated to match new white mockup
Revert "Updated to match new white mockup"
Merge pull request #102 from StanfordHCI/revert-76-jf-recolor

Revert "Updated to match new white mockup"
Resolved conflicts with master
Un-reverted white re-color revert