Slight changes...
Merge https://github.com/IvayloGeorgiev/JokeBook