conflicting version from transcriptome
Merge branch 'master' of https://github.com/schimar/gbs

Conflicts:
	bio.R
Merge branch 'master' of https://github.com/schimar/gbs
Merge branch 'master' of https://github.com/schimar/gbs
Merge branch 'master' of https://github.com/schimar/gbs
Merge branch 'master' of https://github.com/schimar/gbs
Merge branch 'master' of https://github.com/schimar/gbs
Merge branch 'master' of https://github.com/schimar/gbs
changed violin plot code to rep_select