added custom Pacifico font
fixed merge conflicts