final version
git pushMerge branch 'master' of github.com:AdrienLE/p2pstorage