updating files

includes slideshow
Merge branch 'master' of https://github.com/kellytalley/kellytalley.github.io

Conflicts:
	unit6/css/u6style.css
	unit6/unit6.html