-- removed unnecessary code...
Merge origin/master

Conflicts:
	index.html
-- removed left-over scripts from removing the slider from pages...