added gw2
Merge branch 'master' of https://github.com/ffoh/peers