some additions
Merge remote-tracking branch 'origin/master'

Conflicts:
	clisp/math.lisp
	haskell/math.hs
	haskell/prob11-20.hs