Merge pull request #128 from daniel-levin/develop

Added permutations and combinations functions (with tests), addressing #99
Added docs on combinations / permutations
added n <= k condition to combinations function

and also changed x to n in combinations
changed x to n in permutations