Added 2 new custom fonts
Hopefully fixed merge conflicts, added 2 custom fonts