Switched order of movie and quote to match web app.
See last commit
Renaming to be consistent
Merge remote-tracking branch 'origin/master' into solution