Genre and year -grej
Merge branch 'genre-year'