Tweaks
Conflict resolved
Footer styling
Merge branch 'master' of github.com:lizzerdrix/dog_walker