changed over to google fonts
fixed conflicts
Merge pull request #37 from msh345/mawr_styling

Mawr styling
Merge branch 'master' of https://github.com/msh345/perfect_day into map_locking