added a form in the views/questions folder to render in the new and edit pages
updated merge conflict
Merge pull request #13 from CTFigueroa/master

Added a form in the views/questions folder to render in the new and edit pages.