updating questions
Merge branch 'master' into haskell