initial commit of user_model_sl branch.  being committed to allow for our project team members to be able to 'rake db:migrate' however my testing is not yet complete for users.
fixed merge conflicts
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development