receiving basically done
merged it
Merge branch 'master' of github:schachmat/p2p_otr