adding files I edited
fixing whitespaces on Conjurer
Tried my best to fix whitespace changes in conjurer. Also added tests for my code
Fixed with Erics initial feedback
Merge pull request #5 from metamx/master

Cardinality Nodes