Added 2 new NPCs
Merge branch 'master' of https://github.com/morsdyce/gamejam2014.git