added NPC and fixed buttons getting deleted bug
Merge branch 'master' of https://github.com/JazminGonzalez-Rivero/GPROFinal