markup fixes
Merge branch 'express-init' of https://github.com/lanceharper/video-scroller into express-init

Conflicts:
	app/index.html