updated two files
Merge branch 'master' of github.com:dgroot/mreseq