Solve erge conflicts.
Solve merge conflicts, javascript parenthesis problems.
Merge pull request #6 from mathildemouw/get_genres_omdb_api

Pictures and stuff