devise installed and ready
created User model
created User model
Merge branch 'devise'