Updates during the workshop
Merge branch 'master' of github.com:inodb/2014-5-metagenomics-workshop