Completed task 7
Merge branch 'master' of github.com:agilejs/fuh-team-1

Conflicts:
	client/partial/movies/_movies.html