sync
Merge branch 'master' of https://github.com/macmanes/pero_transcriptome

Conflicts:
	tajD.eps