Merge pull request #13 from rgirardRev/JOKE-5-dev

JOKE-5: Added joke 5
Merge pull request #14 from michael-wheelock/MIKE-6-dev

MIKE-6: The number e