Updates font styling.
Updates font styling and fixes confilct.
Merge branch 'master' of github.com:uw-it-aca/spacescout_admin