Merge pull request #24 from mysteriosum/master

stuff
Merge pull request #25 from mysteriosum/master

merge
adding a lot of stuff... NPC and shit

Signed-off-by: Mchapuis <machapu@gmail.com>
Merge pull request #35 from Mchapuis/master

merge my stuff yo