Merge pull request #3 from CTFigueroa/master

Update merge conflict
first commit
merge conflict errors
Merge pull request #4 from CTFigueroa/master

added angular files to the project
added bootsrap for rails project.
fixed merge conflicts
Merge pull request #5 from chinenyem/master

added bootstrap
created user controller with index html, added auth user in app and welcome controller
Merge pull request #6 from csrobinson86/master

created user controller with index html, added auth user in app and welc...
update schema
resolve merge conflict
added categories controller and associated views
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