added task 7
Merge branch 'master' of github.com:agilejs/fancyTeam

Conflicts:
	client/partial/movies/list.html