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

Mawr styling