catching up on commits and updated gem file with factory girl gem