Combined code, fixed state, reset

The code bases have been merged. The game state issues with block adding
have been fixed. Reset has been added by pressing space during gameover.