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

Conflicts:
	python/ambiguity.py
resolved function finished
docstrings added to most methods of ambiguity.py
comments added
Merge branch 'thor2'
small bugfix
Merge branch 'thor2' of https://github.com/gautsson/shrdlite into thor2