finished model side of question creation
fixed merge conflict
fixed merge errors after pulling bug fixes