Added Videos, now Chrome works
Merge branch 'master' into gh-pages

Conflicts:
	css/style.css
	css/style.scss
	index.html