moving target segment
Merge branch 'master' of github.com:vicki-c/hackathon-video

Conflicts:
	public/index.html