It compiles, let's go to sleep now
Merge branch 'master' of github.com:AdrienLE/p2pstorage