merged screens with the new design, merged marvin's commit aswell. 

Gameover screen implemented but not yet final

Signed-off-by: Jefferson Cordero <jepjephooray05@gmail.com>