Exercise 6
Merge branch 'master' of https://github.com/agilejs/2014-10-Dinatriumdihydrogendiphosphat

Conflicts:
	client/partial/movies/_list.html