Merge pull request #20 from mentatzoe/master

Merge conflict solved: Added changes to NPCs and updated Case Generation
adding accusation room stuff
Merge pull request #21 from jcotrel/master

adding accusation room stuff