JohnMai/WhiteSharks — pull request #20 by mentatzoe (2014-01-30 21:16:07+00:00)
Title: Merge conflict solved: Added changes to NPCs and updated Case Generation

Now the NPCs have the right condition and the case generator initializes.
This isn't using the Case class yet.