Merge pull request #515 from 15Dkatz/master

Add a 'Jokes' API

README.md

@@ -309,6 +309,7 @@ API | Description | Auth | HTTPS | Link |
 | Guild Wars 2 | Guild Wars 2 Game Information | `apiKey` | Yes | [Go!](https://wiki.guildwars2.com/wiki/API:Main) |
 | Halo | Halo 5 and Halo Wars 2 Information | `apiKey` | Yes | [Go!](https://developer.haloapi.com/) |
 | Hearthstone | Hearthstone Cards Information | `X-Mashape-Key` | Yes | [Go!](http://hearthstoneapi.com/) |
+| Jokes | Programming and general jokes | No | Yes | [Go!](https://github.com/15Dkatz/official_joke_api) |
 | Jservice | Jeopardy Question Database | No | No | [Go!](http://jservice.io) |
 | Magic The Gathering | Magic The Gathering Game Information | No | No | [Go!](http://magicthegathering.io/) |
 | Marvel | Marvel Comics | `apiKey` | No | [Go!](http://developer.marvel.com) |