conflict resolved
Merge pull request #230 from supriyasawant/mongokit

conflict resolved