- Merging branches.
Merge branch 'master' of https://github.com/sdynerow/Semirings-Library

Conflicts:
	haskell/Generator.py