Finished video fragment.
Merge branch 'master' of https://github.com/goraga1/a_y_p

Conflicts:
	.gitignore