edited typo
corrected merge conflit in application.css and application.js ruby file
changes
changes
Merge pull request #13 from CTFigueroa/master

Added a form in the views/questions folder to render in the new and edit pages.
styling in rails woo
changes
Merge pull request #14 from chinenyem/master

styling rails
updated merge conflict