adding name to readme
Merge remote-tracking branch 'upstream/develop' into develop
fixing merge conflicts in readme
Merging upstream
adding joke class. adding DS_Store to .gitignore
Merge pull request #32 from ande-/develop

Joke class- issue #31