Change path to css for local server
Got sticky nav working but transition is jerky
Remove js code messup
Merge branch 'Sticky-nav-from-scratch'

Conflicts:
	js/script.js
Remove changes bt master and branch
Add about page js; change images
Remove waypoints
Add about page javascript

Need to hide all but one bio still
Change logo z-index; fix jumpy sticky nav
Merge branch 'master' into gh-pages
Fixed menu placement and sticky menu
Merge branch 'master' into gh-pages