updates
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
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
add questions resources
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team5
category has_many questions
Merge pull request #11 from jgkingston/master

Possibly redundant. Defined category/model relationship, added resources :questions
updated