added factory girl, and cancancan