Extract and primitive streaming available
Merge branch 'master' of github.com:skotsjedal/torchive

Conflicts:
	templates/layout.html