worked on footer and added custom fonts
fixing merge conflicts