Merge pull request #52 from RAlmada/master

AddQuestion functionality and fixing question.java which alvin almost broke