Adding sort for matches in combo
Merge branch 'master' of https://github.com/xandrasings/FASTA-project

Conflicts:
	fasta.cpp