gregcaporaso/An-Introduction-To-Applied-Bioinformatics — pull request #61 by gregcaporaso (2014-10-06 02:19:18+00:00)
Title: resolved merge conflict in @wasade's PR

replaces #58