added terrain texture, skybox, increased gravity to -98.1
Fixing merge conflicts
fixing merge