error checking upload
Merge branch 'master' of github.com:marcb1/torrent-flux-watcher