Live video
Merge branch 'master' of https://github.com/msnbc-devices/NBCNews-WebTemplates

Conflicts:
	articleView.html