more stuff
Merge branch 'master' of github.com:jmnybl/setlib

Conflicts:
	test2.pyx