Adding google fonts and nav margin
Fix merge conflict.