test
Merge branch 'master' of https://github.com/cb01/oligotools

Conflicts:
	oligotools/oligotools.py