Commit in preperation of live and git merge
Fixed conflicts with merge
Fixed functions.php
Styling Fix
Styling Fix
Styling tweak to fix services
Tweak
Finish front page styling
Fixed logo thickness
Fixed footer social links (changed color)
Fixed footer colouring in general
Fixed footer menus colouring
Final fix for footer nav
Removed some leftover merge comments
Fixed search button
Fix for header BG issue
Merge pull request #1 from Ashenmaster/merge-state

Merge new fixes into master branch again