Merge remote branch 'apache:add-combinatorics' master
authorILYA Khlopotov <iilyak@ca.ibm.com>
Tue, 24 May 2016 18:28:52 +0000 (11:28 -0700)
committerILYA Khlopotov <iilyak@ca.ibm.com>
Tue, 24 May 2016 18:28:52 +0000 (11:28 -0700)
This closes #2

Signed-off-by: ILYA Khlopotov <iilyak@ca.ibm.com>

Trivial merge