fixing
more fixes
more fixes
adding videos
fix
fix
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore