Resolved merging conflicts; added screen scaling and game speed