merging Merge branch 'master' of github.com:BenLangmead/qtip-experiments
merging
Merge branch 'master' of github.com:BenLangmead/qtip-experiments

BenLangmead/qtip-experiments,BenLangmead/qtip-experiments