Updated Textures

diff --cc main.cpp
index e45ed9698b2662f0c393696c1798a097fb1e9355,b9512cdc8ca072f8543fd9418626285dc27978c6..4aaf1615d4416345138fe84e6b845bd06633d951
--- 1/main.cpp
--- 2/main.cpp
+++ b/main.cpp
@@@ -58,16 -58,6 +58,19 @@@ int main(int argc, char *argv[])
        }
        atexit(Mix_Quit);
  
++<<<<<<< HEAD
 +      //Load music
 +      music = Mix_LoadMUS("assets/BennyHillTheme.wav");
 +      horn = Mix_LoadWAV("assets/air-horn-club-sample_1.wav");
 +      if( music == NULL ){
 +              printf( "Failed to load beat music! SDL_mixer Error: %s\n", Mix_GetError() );
 +      }
 +      //Mix_PlayMusic( music, -1 );
 +
 +
 +
++=======
++>>>>>>> 1c0767766506407babdfefea9efe2b5627569244
        // Turn on double buffering
      SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
      // Create the window

diff --cc src/entities.cpp
Simple merge