Merge branch 'master' of https://github.com/ouiliame/tetris.js
Merge remote-tracking branch 'origin/master' into gh-pages