Merge branch 'master' of https://github.com/pdoblhoff/calculi

Conflicts:
	test.txt