F(x) = (1+x)/(1-x)
Merge branch 'master' into function

Conflicts:
	Tests/SimpleCalcTest.php
Merge pull request #11 from gajdaw2/function

F(x) = (1+x)/(1-x)