added gilles and thomas as new members of our team :-)
Merge branch 'master' of github.com:cismet/main-website