test
Merge branch 'master' of https://github.com/jerry82/PyCrackCode

Conflicts:
	ans
test