add combining same color feature
Merge branch 'master' of github.com:charsunny/numgame
fix conflict