Merging new timer display into master

Now throws a dialog once the game is over, showing the time in seconds, instead of showing it in the console