Merge remote-tracking branch 'origin/dev' into feature/score-screen
Merge remote-tracking branch 'origin/dev' into feature/score-screen
Fixed lives label
Added end screen number sprite preloader
Removed test score
Merge branch 'dev'
whitespace tidy
Tidied code conflicts after css preloader...
Merge branch 'master' of https://github.com/danbentley/Nesta-Interactives---Game
Adding check for canvas support
Merge branch 'master' of https://github.com/danbentley/Nesta-Interactives---Game
Hiding score and lives by default
Hiding lives and score counter with js once game has ended
Merge branch 'dev'
Fixing bug where score and lives never display for second play through
Adding ball and paddle files
Moved appropriate methods and properties to the correct object
Renamed paddlePosition to just position
Changed paddleHeight and paddleWidth to height and width respectively
Moved PADDLE_COLLISION_PADDING to game from paddle.js since the paddle
shouldn't know about the padding added to make the collision detection feel
more natural