fixing a merge
Merge branch 'Axner' of https://github.com/gautsson/shrdlite into Axner

Conflicts:
	python/ambiguity.py
resolved function finished