Martin's figure for wiki
added ; bugfix in smokebox
Merge branch 'master' of github.com:BauerLab/ngsane
Merge remote-tracking branch 'clark-lab/master'