first pass at torrent #134
Merge branch 'master' of github.com:dancrew32/marcel