whatev
Merge branch 'master' of https://github.com/NUKnightLab/VideoSliderJS

Conflicts:
	codekit-config.json
Updated layout