fixed fixtures
fix conflict
Merge branch 'master' of https://github.com/tmad4000/ideaflow-meteor-mongo
comments added