Merge pull request #36 from Mchapuis/master

I get de changetzz
fixed teh npcs

Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Merge pull request #37 from Mchapuis/master

pull pull pull pull pull pull pull pull pull
Merge branch 'master' of https://github.com/mysteriosum/ChromatoseGit
Merge pull request #28 from mysteriosum/master

stuff