added user_id to strong prams
 added a user controller
fixed phase 2 merge conflicts
Merge pull request #16 from evja/LindsayH-devise2

Lindsay h devise2