Revert to b5cb7ef
Merge branch 'master' of https://github.com/nevesly/python

Conflicts:
	algorithm/abcd.py