created devise user model
devise install complete, and facebook connect working (spike complete), still need tests
added tests for traditional sign up/sign in, facebook connect tests are still in progress, all test are green thus far
fix merge conflicts
Merge pull request #1 from gjackson12/devise_setup

Devise setup