Working... kind of
Merge branch 'e2e' of github.com:kathydoody/HTML5_PlaylistApp into e2e

Conflicts:
	app/scripts/directives/kvList.js
	karma.conf.js
	test/spec/directives/kvList.js