cos
Merge branch 'master' of https://github.com/tomecki/cats

Conflicts:
	cats/test/readerstest.py