new sliders
Merge branch 'master' of https://github.com/mrcoven94/engineeringexpectations

Conflicts:
	index.html