Merge pull request #7 from jgkingston/master

Added categories controller and controller view files
updates
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
created user controller, updated with full crud and also set up params for devise in application controller
created user controller, updated with full crud and also set up params for devise in application controller
Merge pull request #8 from csrobinson86/master

Updated user controller, and application controller
created questions_controller.rb and folder for questions html.erb
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
added "resources :questions" to the config/routes.rb file
Merge pull request #10 from CTFigueroa/master

added "resources :questions" to the config/routes.rb file
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
category has_many questions