resolve merge conflict
Merge branch 'master' of github.com:Atheros1/PyBitmessage
remove lines from wrong branch