Fixed
Fix
Merge branch 'master' of https://github.com/gudrun89/ThrounHugbunadar

Conflicts:
	teiknaReikn.py