manifest.
Manifest.
Merge commit 'b218de7'

Conflicts:
	src/cljs_video_control/manifest.clj