added factorygirl and user factory