rostoosl
Merge branch 'master' of https://github.com/swo/rosalind

Conflicts:
	tools/rostools.py
pper