Added texture support and basic textures

diff --cc include/entities.h
Simple merge

diff --cc src/entities.cpp
index 429e3e58b5b8ea864d34423cc538e36114a22760,d5328f0303a398368b4bf807c45adf5819a04f42..64c8cb7de7194c6d897e0e1171eca02eed93ac31
--- 1/src/entities.cpp
--- 2/src/entities.cpp
+++ b/src/entities.cpp
@@@ -125,7 -89,7 +125,8 @@@ Player::Player(){ //sets all of the pla
        alive = true;
        ground = false;
        near = true;
 +      texture = loadTexture("assets/player.png");
+       inv = new Inventory(PLAYER_INV_SIZE);
  }
  
  void Player::interact(){ //the function that will cause the player to search for things to interact with
@@@ -141,7 -105,7 +142,8 @@@ NPC::NPC(){        //sets all of the NPC speci
        alive = true;
        canMove = true;
        near = false;
 +      texture = loadTexture("assets/NPC.png");
+       inv = new Inventory(NPC_INV_SIZE);
  }
  
  void NPC::addAIFunc(int (*func)(NPC *)){

diff --cc src/main.cpp
Simple merge