starting work on event logger, adding factories
merging with master
trying to get factorygirl to work
merging with master
Making FactoryGirl work