Update 'About us' section
Add staff table
Fix merge conflict