resize video
Merge branch 'master' of github.com:jodersky/playGraph

Conflicts:
	app/index.html
Merge branch 'master' of github.com:jodersky/playGraph