Fixed error from header
Merge branch 'master' of https://github.com/pwilkins05/CS246-Assignment

Conflicts:
	slider.htm
had to delete file