fixed tests for user controller, added test for joke controller
Merge branch 'master' of https://github.com/IvayloGeorgiev/JokeBook