Tidied player class
Added NPC class and some functionality for talking