Hand-in version of the riddles
Merge branch 'master' into genericEmploisRules