Made changes to QuestionFactory and wrote tests.
Added eclipse preference file.
fixed merge conflicts and folder structure
added QuestionFactory