video update sunday afternoon
Merge branch 'gh-pages' of https://github.com/tyso

Conflicts:
	.DS_Store