Added CRUD to GenreService and wrote a few tests.
fixed merge conflict
Merge branch 'master' of https://github.com/ChristianJGarrido/thejuke