made combiner more generic
Merge branch 'master' of github.com:jgbaylon/scopely-challenge