Added the 'Meet the team' page
fixing merge conflicts