Manual merge
Fixed reset game

Some bugs: timer stops on game over and reset, but does not start when
user continues playing. There is nothing for Reset high scores from what
I see.