Add video in place
Merge branch 'master' of github.com:drlippman/IMathAS

Conflicts:
	imascore.css
	javascript/general.js