Edited the about page
Merge remote-tracking branch 'origin/dev' into dev
Edited the team pages