Blablar
Merge branch 'master' of github.com:justuswilhelm/derp-octo-hipster

Conflicts:
	__pycache__/toolkit.cpython-33.pyc
	rosalind.pnproj
	rosalind.pnps
	toolkit.py