initial commit
Joke added
Merge pull request #2 from mairind/test_2

Test 2