moving to desktop, incorporating file transfers...
developing client, incorporating file-transfer
Merge branch 'master' of github.com:techjeffharris/off-the-record