Editting tests
Merge branch 'master' of https://github.com/netf/Prime

Conflicts:
	tests/tests.py