fix conflict errors
Work in progress for footer, css edits, and page layout edits for events and home
header and css changes
Remove old agriculture template