complete GCON
Merge branch 'master' of https://github.com/billletson/rosalind

Conflicts:
	rosalind/alignment.py