Merge pull request #9 from brain-murphy/brian-branch

Brian branch
Pre merge.
Fixed merge errors.
luis
New MarkovModel with internal classes

Incorporated ResponseSeed and KGram into MarkovModel
hi
Fixed read in
fixed the same merge conflicts
Merge pull request #10 from brain-murphy/connorbranch

Connorbranch
merge conflicts on eric's branches
merged some whitespace. I'm kinda badass