Merge branch 'gh-pages' of github.com:tapiocode/2048 into gh-pages
Merge branch 'timer' into gh-pages