Add calculation for combinations and corresponding test
Merge branch 'master' of github.com:novoda/dojos