new test
Merge branch 'master' of https://github.com/PrehistoricTeam/pycrypt

Conflicts:
	test.py
Added sphinx docs template