changed comboTimer to be based on waves
Merge branch 'gh-pages' of http://github.com/hextris/hextris into gh-pages