todo: add twitter accounts links to team members
Merge branch 'master' into build