update info of our team
Merge branch 'master' of github.com:koding/global.hackathon
Merge pull request #1347 from blackbiron/master

update info of our team