test1
Merge branch 'test'
test2
test3
Merge branch 'test'

Conflicts:
	math.hs
Revert cd4e4e6..92bc5ee

This rolls back to commit cd4e4e67d75ef39dd20db167194027c6bf85098b.