Shot times.
Merge branch 'master' of github.com:cassiel/cljs-video-control

Conflicts:
	src/cljs_video_control/ajax.clj
	src/cljs_video_control/manifest.clj