wasade/An-Introduction-To-Applied-Bioinformatics — pull request #1 by gregcaporaso (2014-10-06 02:14:57+00:00)
Title: fixed merge conflict in @wasade's changes 

replaces #58