Story 5 client
Merge branch 'master' of github.com:ccjavascriptteam1/movie-database-node

Conflicts:
	test/karma/integration/index.spec.js