Package import stuff
Merge branch 'master' of github.com:c1phr/p2pchat