SeqWare/seqware — pull request #241 by denis-yuen (2014-07-09 15:23:35+00:00)
Title: Fix merge conflict

Looks like there was a problem with the merge conflict going from master to develop