Added some comments to Combinations
Merging with upstream
Merge branch 'master' of ssh://git@github.com/fordfiler6/FordFiler-Zappos.git