Merge branch 'master' of https://github.com/nokeeo/movieMood

Conflicts:
Trying to commit